From c88e95cd565efad1181c9d7008a8d54d59ef56c3 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Fri, 11 Apr 2008 17:09:38 +0200
Subject: [PATCH] Updated Makefile
* To include new classes
* To use a "normally" installed OGLFT
---
Makefile | 13 +++++++++++--
Starsphere.h | 3 ++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 3f8d32d..5e27ea3 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 1ec5c45..0822f18 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
--
GitLab