From e90cb9504b5814338d1301b0953600b0c9d3d5dc Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Thu, 12 Jun 2008 12:49:14 +0200
Subject: [PATCH] Fixed BOINC include dir

* BOINC seems to have changes its include dir from upper to lower case
* Also: fixed install dir variable in makefiles
* Also: removed commented/unused code
---
 build.sh                      | 42 ++++++++++++-----------------------
 src/framework/Makefile        |  2 +-
 src/framework/Makefile.mingw  |  2 +-
 src/starsphere/Makefile       |  4 ++--
 src/starsphere/Makefile.macos |  4 ++--
 src/starsphere/Makefile.mingw |  2 +-
 6 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/build.sh b/build.sh
index 66d97de..c5c402f 100755
--- a/build.sh
+++ b/build.sh
@@ -127,15 +127,6 @@ prepare_generic()
 		echo "Retrieving SDL (this may take a while)..." | tee -a $LOGFILE
 		svn checkout http://svn.libsdl.org/branches/SDL-1.2 . >> $LOGFILE 2>&1 || failure
 	fi
-
-# 	echo "Retrieving SDL (this may take a while)..." | tee -a $LOGFILE
-# 	cd $ROOT/3rdparty || failure
-# 	wget http://www.libsdl.org/release/SDL-1.2.14.tar.gz >> $LOGFILE 2>&1 || failure
-# 	tar -xzf SDL-1.2.14.tar.gz >> $LOGFILE 2>&1 || failure
-# 	rm SDL-1.2.14.tar.gz >> $LOGFILE 2>&1 || failure
-# 	substitute old source tree
-# 	rm -rf sdl >> $LOGFILE 2>&1 || failure
-# 	mv SDL-1.2.14 sdl >> $LOGFILE 2>&1 || failure
 	
 	echo "Retrieving Freetype2 (this may take a while)..." | tee -a $LOGFILE
 	cd $ROOT/3rdparty || failure
@@ -310,8 +301,6 @@ build_generic_win32()
 	# patch: build static lib instead of shared
 	cd $ROOT/3rdparty/oglft/liboglft || failure
 	patch CMakeLists.txt < $ROOT/patches/CMakeLists.txt.liboglft.patch >> $LOGFILE 2>&1 || failure
-	## patch: include windows.h for all WIN32 builds (not only MSVC) -> already submitted upstream!!!!
-	#patch OGLFT.h.cmake < $ROOT/patches/OGLFT.h.cmake.patch >> $LOGFILE 2>&1 || failure
 	cp $ROOT/patches/toolchain-linux-mingw.oglft.cmake $ROOT/build/oglft >> $LOGFILE 2>&1 || failure
 	export OGLFT_INSTALL=$ROOT/install
 	echo "Building OGLFT..." | tee -a $LOGFILE
@@ -334,31 +323,28 @@ build_generic_win32()
 	cd $ROOT/3rdparty/boinc || failure
 	./_autosetup >> $LOGFILE 2>&1 || failure
 	cd $ROOT/build/boinc || failure
+	# note: configure is still required but we don't use the generated Makefile
 	$ROOT/3rdparty/boinc/configure --host=$TARGET_HOST --build=$BUILD_HOST --prefix=$ROOT/install --includedir=$ROOT/install/include --oldincludedir=$ROOT/install/include --enable-shared=no --enable-static=yes --disable-server --disable-client >> $LOGFILE 2>&1 || failure
-# # 	make >> $LOGFILE 2>&1 || failure
 	cd $ROOT/build/boinc/api || failure
 	cp $ROOT/3rdparty/boinc/api/Makefile.mingw . >> $LOGFILE 2>&1 || failure
 	patch Makefile.mingw < $ROOT/patches/boinc.Makefile.mingw.patch >> $LOGFILE 2>&1 || failure
 	export BOINC_SRC=$ROOT/3rdparty/boinc || failure
 	cd $ROOT/build/boinc || failure
 	make -f api/Makefile.mingw >> $LOGFILE 2>&1 || failure
-# 	make install >> $LOGFILE 2>&1 || failure
-# 	cp $ROOT/build/boinc/config.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-# 	cp $ROOT/build/boinc/version.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
 	cp $ROOT/build/boinc/libboinc.a $ROOT/install/lib >> $LOGFILE 2>&1 || failure
-	mkdir -p $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/api/boinc_api.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/api/graphics2.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/app_ipc.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/boinc_win.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/common_defs.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/hostinfo.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/proxy_info.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/prefs.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/miofile.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/mfile.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/parse.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
-	cp $ROOT/3rdparty/boinc/lib/util.h $ROOT/install/include/BOINC >> $LOGFILE 2>&1 || failure
+	mkdir -p $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/api/boinc_api.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/api/graphics2.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/app_ipc.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/boinc_win.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/common_defs.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/hostinfo.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/proxy_info.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/prefs.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/miofile.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/mfile.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/parse.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
+	cp $ROOT/3rdparty/boinc/lib/util.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
 	echo "Successfully built and installed BOINC!" | tee -a $LOGFILE
 }
 
diff --git a/src/framework/Makefile b/src/framework/Makefile
index 02108c0..6bc64f1 100644
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -28,7 +28,7 @@ CXX?=g++
 # variables
 CPPFLAGS = $(shell $(FRAMEWORK_INSTALL)/bin/sdl-config --cflags)
 CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/BOINC -I/usr/include
+CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/boinc -I/usr/include
 
 DEPS = Makefile
 OBJS = AbstractGraphicsEngine.o GraphicsEngineFactory.o WindowManager.o Resource.o ResourceFactory.o BOINCClientAdapter.o
diff --git a/src/framework/Makefile.mingw b/src/framework/Makefile.mingw
index 44a4769..6b0b140 100644
--- a/src/framework/Makefile.mingw
+++ b/src/framework/Makefile.mingw
@@ -28,7 +28,7 @@ CXX?=g++
 # variables
 CPPFLAGS = $(shell $(FRAMEWORK_INSTALL)/bin/sdl-config --cflags)
 CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/BOINC -I$(FRAMEWORK_INSTALL)/include
+CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/boinc -I$(FRAMEWORK_INSTALL)/include
 
 DEPS = Makefile
 OBJS = AbstractGraphicsEngine.o GraphicsEngineFactory.o WindowManager.o Resource.o ResourceFactory.o BOINCClientAdapter.o
diff --git a/src/starsphere/Makefile b/src/starsphere/Makefile
index 4ef1d5e..7462c02 100644
--- a/src/starsphere/Makefile
+++ b/src/starsphere/Makefile
@@ -31,10 +31,10 @@ LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs)
 LIBS += -lboinc_api -lboinc -L/usr/lib
 LIBS += -Wl,-Bdynamic $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs) -lGL -lGLU
 
-CPPFLAGS = -I$(FRAMEWORK_INSTALL)/include
+CPPFLAGS = -I$(STARSPHERE_INSTALL)/include
 CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
 CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/BOINC -I/usr/include
+CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/boinc -I/usr/include
 
 DEPS = Makefile
 OBJS = Starsphere.o StarsphereS5R3.o EinsteinS5R3Adapter.o starlist.o snr_list.o pulsar_list.o $(RESOURCESPEC).o
diff --git a/src/starsphere/Makefile.macos b/src/starsphere/Makefile.macos
index cb40d1b..36d52a8 100644
--- a/src/starsphere/Makefile.macos
+++ b/src/starsphere/Makefile.macos
@@ -31,10 +31,10 @@ LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs)
 LIBS += -lboinc_api -lboinc -L/usr/lib
 LIBS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs)
 
-CPPFLAGS = -I$(FRAMEWORK_INSTALL)/include
+CPPFLAGS = -I$(STARSPHERE_INSTALL)/include
 CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
 CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/BOINC -I/usr/include
+CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/boinc -I/usr/include
 
 DEPS = Makefile
 OBJS = Starsphere.o StarsphereS5R3.o EinsteinS5R3Adapter.o starlist.o snr_list.o pulsar_list.o $(RESOURCESPEC).o
diff --git a/src/starsphere/Makefile.mingw b/src/starsphere/Makefile.mingw
index 717f689..57828dc 100644
--- a/src/starsphere/Makefile.mingw
+++ b/src/starsphere/Makefile.mingw
@@ -34,7 +34,7 @@ LIBS += -Wl,-Bdynamic $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs
 CPPFLAGS = -I$(STARSPHERE_INSTALL)/include
 CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
 CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
-CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/BOINC
+CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/boinc
 
 DEPS = Makefile
 OBJS = Starsphere.o StarsphereS5R3.o EinsteinS5R3Adapter.o starlist.o snr_list.o pulsar_list.o $(RESOURCESPEC).o
-- 
GitLab