diff --git a/Makefile b/Makefile index 3f8d32d1703ce42e783b301ef6144179f925effa..5e27ea3d98eab4c90190d984dcf7fe046945b2f7 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ BOINC_PREFIX ?= /home/oliver/development/aei/boinc CXX ?= g++ # variables -LIBS = -L${BOINC_PREFIX}/lib -L${PWD}/oglft/lib -Bstatic $(shell sdl-config --static-libs) -lfreetype -lftgl -lOGLFT -lboinc_api -lboinc -Wl,-Bdynamic -lGL -lGLU +LIBS = -L${BOINC_PREFIX}/lib -Bstatic $(shell sdl-config --static-libs) -lfreetype -lftgl -lOGLFT -lboinc_api -lboinc -Wl,-Bdynamic -lGL -lGLU CPPFLAGS = -DOGLFT_NO_SOLID -DOGLFT_NO_QT -I/usr/include $(shell sdl-config --cflags) $(shell pkg-config --cflags ftgl) -I${BOINC_PREFIX}/include/BOINC DEPS = Makefile -OBJS = starlist.o snr_list.o pulsar_list.o AbstractGraphicsEngine.o Starsphere.o WindowManager.o ${RESOURCESPEC}.o Resource.o ResourceFactory.o BOINCClientAdapter.o +OBJS = starlist.o snr_list.o pulsar_list.o AbstractGraphicsEngine.o GraphicsEngineFactory.o Starsphere.o StarsphereS5R3.o WindowManager.o ${RESOURCESPEC}.o Resource.o ResourceFactory.o BOINCClientAdapter.o EinsteinS5R3Adapter.o DEBUGFLAGSCPP = -pg -ggdb -O0 RESOURCESPEC = resources @@ -30,15 +30,24 @@ starsphere: $(DEPS) main.C $(OBJS) Starsphere.o: $(DEPS) Starsphere.cpp $(CXX) -g ${CPPFLAGS} -c Starsphere.cpp + +StarsphereS5R3.o: $(DEPS) StarsphereS5R3.cpp + $(CXX) -g ${CPPFLAGS} -c StarsphereS5R3.cpp AbstractGraphicsEngine.o: AbstractGraphicsEngine.cpp $(CXX) -g ${CPPFLAGS} -c AbstractGraphicsEngine.cpp +GraphicsEngineFactory.o: GraphicsEngineFactory.cpp + $(CXX) -g ${CPPFLAGS} -c GraphicsEngineFactory.cpp + WindowManager.o: Makefile WindowManager.cpp $(CXX) -g ${CPPFLAGS} -c WindowManager.cpp BOINCClientAdapter.o: Makefile BOINCClientAdapter.cpp $(CXX) -g ${CPPFLAGS} -c BOINCClientAdapter.cpp + +EinsteinS5R3Adapter.o: Makefile EinsteinS5R3Adapter.cpp + $(CXX) -g ${CPPFLAGS} -c EinsteinS5R3Adapter.cpp starlist.o: $(DEPS) starlist.C $(CXX) -g ${CPPFLAGS} -c starlist.C diff --git a/Starsphere.h b/Starsphere.h index 1ec5c45e4e64289511026a25e9ea83ed1b09139b..0822f18e89b61526056d60bc6259a409dd6a97c9 100644 --- a/Starsphere.h +++ b/Starsphere.h @@ -13,11 +13,12 @@ #include <SDL_opengl.h> #include <FTGLPolygonFont.h> +#include <oglft/OGLFT.h> + #include <util.h> #include "AbstractGraphicsEngine.h" -#include "oglft/include/OGLFT.h" /* SIN and COS take arguments in DEGREES */ #define PI 3.14159265