From 361f718248fd1833965522df243a2ee3dd57620c Mon Sep 17 00:00:00 2001 From: Oliver Bock <oliver.bock@aei.mpg.de> Date: Thu, 16 Oct 2008 10:31:04 +0200 Subject: [PATCH] Refined Mac OS build * Make sure BOINC uses Apple's GL framework (required to build graphics lib) * Graphics lib required to embed application icon via setMacIcon() * Note: graphics lib depends on libjpeg (fink), hence we need /sw/include, too --- build.sh | 7 ++++++- src/starsphere/Makefile.macos | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 049b3b2..7dc7e9b 100755 --- a/build.sh +++ b/build.sh @@ -261,7 +261,12 @@ build_generic() ./_autosetup >> $LOGFILE 2>&1 || failure chmod +x configure >> $LOGFILE 2>&1 || failure cd $ROOT/build/boinc || failure - $ROOT/3rdparty/boinc/configure --prefix=$ROOT/install --enable-shared=no --enable-static=yes --disable-server --disable-client >> $LOGFILE 2>&1 || failure + if [ "$1" == "$TARGET_MAC_INTEL" -o "$1" == "$TARGET_MAC_PPC" ]; then + export CPPFLAGS=-I/sw/include + $ROOT/3rdparty/boinc/configure --prefix=$ROOT/install --enable-shared=no --enable-static=yes --disable-server --disable-client --with-apple-opengl-framework >> $LOGFILE 2>&1 || failure + else + $ROOT/3rdparty/boinc/configure --prefix=$ROOT/install --enable-shared=no --enable-static=yes --disable-server --disable-client >> $LOGFILE 2>&1 || failure + fi make >> $LOGFILE 2>&1 || failure make install >> $LOGFILE 2>&1 || failure echo "Successfully built and installed BOINC!" | tee -a $LOGFILE diff --git a/src/starsphere/Makefile.macos b/src/starsphere/Makefile.macos index 5722945..c2bd56e 100644 --- a/src/starsphere/Makefile.macos +++ b/src/starsphere/Makefile.macos @@ -29,7 +29,7 @@ CXX ?= g++ LIBS = -lframework -loglft -L$(STARSPHERE_INSTALL)/lib LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --libs) -LIBS += -lboinc_api -lboinc -L$(STARSPHERE_INSTALL)/lib +LIBS += -lboinc_graphics2 -lboinc_api -lboinc -L$(STARSPHERE_INSTALL)/lib LIBS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs) LDFLAGS = -static-libgcc -- GitLab