diff --git a/samples/example_app/MakeMacExample.sh b/samples/example_app/MakeMacExample.sh index a1f59cacfb..674fa3e716 100644 --- a/samples/example_app/MakeMacExample.sh +++ b/samples/example_app/MakeMacExample.sh @@ -26,8 +26,9 @@ # Updated 8/3/12 for TrueType fonts # Updated 11/8/12 to add slide_show # Updated 4/14/15 to fix build instructions +# Updated 4/30/20 for Xcode 11 # -## This script requires OS 10.6 or later +## This script requires OS 10.7 or later # ## If you drag-install Xcode 4.3 or later, you must have opened Xcode ## and clicked the Install button on the dialog which appears to @@ -76,29 +77,7 @@ export PATH="${TOOLSPATH1}":"${TOOLSPATH2}":/usr/local/bin:$PATH SDKPATH=`xcodebuild -version -sdk macosx Path` -rm -fR i386 x86_64 - -echo -echo "***************************************************" -echo "******* Building 32-bit Intel Application *********" -echo "***************************************************" -echo - -export CC="${GCCPATH}";export CXX="${GPPPATH}" -export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,i386" -export VARIANTFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -fvisibility=hidden -fvisibility-inlines-hidden" -export SDKROOT="${SDKPATH}" -export MACOSX_DEPLOYMENT_TARGET=10.4 - -make -f Makefile_mac clean -make -f Makefile_mac all - -if [ $? -ne 0 ]; then exit 1; fi - -mkdir i386 -mv uc2 i386/ -mv uc2_graphics i386/ -mv slide_show i386/ +rm -fR x86_64 echo echo "***************************************************" @@ -108,9 +87,9 @@ echo export CC="${GCCPATH}";export CXX="${GPPPATH}" export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64" -export VARIANTFLAGS="-isysroot ${SDKPATH} -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1050 -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 -fvisibility=hidden -fvisibility-inlines-hidden" +export VARIANTFLAGS="-isysroot ${SDKPATH} -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070 -fvisibility=hidden -fvisibility-inlines-hidden" export SDKROOT="${SDKPATH}" -export MACOSX_DEPLOYMENT_TARGET=10.5 +export MACOSX_DEPLOYMENT_TARGET=10.7 make -f Makefile_mac clean make -f Makefile_mac all diff --git a/samples/example_app/Makefile_mac b/samples/example_app/Makefile_mac index 6941bc177c..2b67cef6d0 100644 --- a/samples/example_app/Makefile_mac +++ b/samples/example_app/Makefile_mac @@ -24,7 +24,7 @@ FRAMEWORKS_DIR = /System/Library/Frameworks CXXFLAGS = $(VARIANTFLAGS) \ -g \ - -stdlib=libstdc++ \ + -stdlib=libc++ \ -DAPP_GRAPHICS \ -I$(BOINC_CONFIG_DIR) \ -I$(BOINC_DIR) \ @@ -70,11 +70,11 @@ uc2_graphics: uc2_graphics.o ttfont.o $(BOINC_BUILD_DIR)/libboinc.a\ $(BOINC_BUILD_DIR)/libboinc_graphics2.a $(CXX) $(CXXFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o ttfont.o\ -lboinc_graphics2 -lboinc_api -lboinc -ljpeg -lfreetype -lftgl -lz -lbz2\ - -framework AppKit -framework GLUT -framework OpenGL + -framework AppKit -framework GLUT -framework OpenGL -framework IOSurface slide_show: slide_show.o $(BOINC_BUILD_DIR)/libboinc.a\ $(BOINC_BUILD_DIR)/libboinc_graphics2.a $(CXX) $(CXXFLAGS) $(LDFLAGS) -o slide_show slide_show.o\ -lboinc_graphics2 -lboinc_api -lboinc -ljpeg -lboinc_zip\ - -framework AppKit -framework GLUT -framework OpenGL - \ No newline at end of file + -framework AppKit -framework GLUT -framework OpenGL -framework IOSurface + diff --git a/samples/example_app/Makefile_mac2 b/samples/example_app/Makefile_mac2 index fddbcb2814..cf0729a8f1 100644 --- a/samples/example_app/Makefile_mac2 +++ b/samples/example_app/Makefile_mac2 @@ -26,7 +26,7 @@ FRAMEWORKS_DIR = /System/Library/Frameworks CXXFLAGS_ALL = \ -g \ - -stdlib=libstdc++ \ + -stdlib=libc++ \ -DAPP_GRAPHICS \ -I$(BOINC_CONFIG_DIR) \ -I$(BOINC_DIR) \ @@ -43,20 +43,12 @@ LDFLAGS_ALL = \ -Wl,-L/usr/lib \ -Wl,-L. -CXXFLAGS_i386 = -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \ - $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_i386 = -Wl,-arch,i386 $(LDFLAGS_ALL) - -CXXFLAGS_x86_64 = -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1050 -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \ +CXXFLAGS_x86_64 = -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070 \ $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden LDFLAGS_x86_64 = -Wl,-arch,x86_64 $(LDFLAGS_ALL) OBJ = \ - uc2_i386.o \ - ttfont_i386.o \ - uc2_graphics_i386.o \ - slide_show_i386.o \ uc2_x86_64.o \ ttfont_x86_64.o \ uc2_graphics_x86_64.o \ @@ -64,7 +56,6 @@ OBJ = \ PROGS = \ - uc2_i386 uc2_graphics_i386 slide_show_i386 \ uc2_x86_64 uc2_graphics_x86_64 slide_show_x86_64 all: $(PROGS) @@ -72,27 +63,11 @@ all: $(PROGS) clean: /bin/rm -f $(PROGS) $(OBJ) -uc2_i386: export MACOSX_DEPLOYMENT_TARGET=10.4 -uc2_graphics_i386: export MACOSX_DEPLOYMENT_TARGET=10.4 -slide_show_i386: export MACOSX_DEPLOYMENT_TARGET=10.4 uc2_x86_64: export MACOSX_DEPLOYMENT_TARGET=10.5 -uc2_graphics_x86_64: export MACOSX_DEPLOYMENT_TARGET=10.5 -slide_show_x86_64: export MACOSX_DEPLOYMENT_TARGET=10.5 +uc2_graphics_x86_64: export MACOSX_DEPLOYMENT_TARGET=10.7 +slide_show_x86_64: export MACOSX_DEPLOYMENT_TARGET=10.7 -target uc2_i386: MACOSX_DEPLOYMENT_TARGET=10.4 -uc2_i386.o: uc2.cpp - $(CXX) -c $(CXXFLAGS_i386) uc2.cpp -o uc2_i386.o - -ttfont_i386.o: $(BOINC_API_DIR)/ttfont.cpp - $(CXX) -c $(CXXFLAGS_i386) $(BOINC_API_DIR)/ttfont.cpp -o ttfont_i386.o - -uc2_graphics_i386.o: uc2_graphics.cpp - $(CXX) -c $(CXXFLAGS_i386) uc2_graphics.cpp -o uc2_graphics_i386.o - -slide_show_i386.o: slide_show.cpp - $(CXX) $(CXXFLAGS_i386) -c slide_show.cpp -o slide_show_i386.o - -target uc2_x86_64: MACOSX_DEPLOYMENT_TARGET=10.5 +target uc2_x86_64: MACOSX_DEPLOYMENT_TARGET=10.7 uc2_x86_64.o: uc2.cpp $(CXX) -c $(CXXFLAGS_x86_64) uc2.cpp -o uc2_x86_64.o @@ -105,22 +80,6 @@ uc2_graphics_x86_64.o: uc2_graphics.cpp slide_show_x86_64.o: slide_show.cpp $(CXX) $(CXXFLAGS_x86_64) -c slide_show.cpp -o slide_show_x86_64.o -uc2_i386: uc2_i386.o $(BOINC_BUILD_DIR)/libboinc_api.a $(BOINC_BUILD_DIR)/libboinc.a - $(CXX) $(CXXFLAGS_i386) $(LDFLAGS_i386) -o uc2_i386 uc2_i386.o -lboinc_api -lboinc - -uc2_graphics_i386: uc2_graphics_i386.o ttfont_i386.o $(BOINC_BUILD_DIR)/libboinc.a\ - $(BOINC_BUILD_DIR)/libboinc_graphics2.a $(FREETYPE_DIR/objs/.libs/libfreetype.a\ - $(FTGL_DIR)/src/.libs/libftgl.a - $(CXX) $(CXXFLAGS_i386) $(LDFLAGS_i386) -o uc2_graphics_i386 uc2_graphics_i386.o\ - ttfont_i386.o -lboinc_graphics2 -lboinc_api -lboinc -ljpeg -lfreetype -lftgl -lz\ - -lbz2 -framework AppKit -framework GLUT -framework OpenGL - -slide_show_i386: slide_show_i386.o $(BOINC_BUILD_DIR)/libboinc.a\ - $(BOINC_BUILD_DIR)/libboinc_graphics2.a - $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_i386) -o slide_show_i386 slide_show_i386.o\ - -lboinc_graphics2 -lboinc_api -lboinc -ljpeg -lboinc_zip\ - -framework AppKit -framework GLUT -framework OpenGL - uc2_x86_64: uc2_x86_64.o $(BOINC_BUILD_DIR)/libboinc_api.a $(BOINC_BUILD_DIR)/libboinc.a $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_x86_64 uc2_x86_64.o -lboinc_api -lboinc @@ -129,10 +88,11 @@ uc2_graphics_x86_64: uc2_graphics_x86_64.o ttfont_x86_64.o $(BOINC_BUILD_DIR)/li $(FTGL_DIR)/src/.libs/libftgl.a $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_graphics_x86_64\ uc2_graphics_x86_64.o ttfont_x86_64.o -lboinc_graphics2 -lboinc_api -lboinc -ljpeg\ - -lfreetype -lftgl -lz -lbz2 -framework AppKit -framework GLUT -framework OpenGL + -lfreetype -lftgl -lz -lbz2 -framework AppKit -framework GLUT -framework OpenGL\ + -framework IOSurface slide_show_x86_64: slide_show_x86_64.o $(BOINC_BUILD_DIR)/libboinc.a\ $(BOINC_BUILD_DIR)/libboinc_graphics2.a $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o slide_show_x86_64 slide_show_x86_64.o\ -lboinc_graphics2 -lboinc_api -lboinc -ljpeg -lboinc_zip\ - -framework AppKit -framework GLUT -framework OpenGL + -framework AppKit -framework GLUT -framework OpenGL -framework IOSurface diff --git a/samples/example_app/ReadMe.txt b/samples/example_app/ReadMe.txt index 2e99b84818..836566ac66 100644 --- a/samples/example_app/ReadMe.txt +++ b/samples/example_app/ReadMe.txt @@ -4,6 +4,8 @@ First build the BOINC libraries: cd [path]/mac_build source BuildMacBOINC.sh -lib +NOTE: The libboinc_graphics2.a library and the graphics app must be built with the same version of Xcode + For more details, see the instructions in that script's comments or at: [path]/mac_build/HowToBuildBOINC_XCode.rtf diff --git a/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj b/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj index bc8ef26d28..1d8368064e 100644 --- a/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj +++ b/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj @@ -15,9 +15,6 @@ dependencies = ( DDC479C015AC57C40022401F /* PBXTargetDependency */, DDC479BE15AC57BC0022401F /* PBXTargetDependency */, - DD84C7200C856DA6000EBEC4 /* PBXTargetDependency */, - DD84C7220C856DA6000EBEC4 /* PBXTargetDependency */, - DD84B698164D0151008E1369 /* PBXTargetDependency */, DD5937AB164D1759001D94A5 /* PBXTargetDependency */, ); name = Build_All; @@ -26,22 +23,12 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - DD08CB70164CAC1A005B47DD /* slide_show.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD08CB6F164CAC1A005B47DD /* slide_show.cpp */; }; - DD1194B00F42CB4900C2BC25 /* uc2_graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD1194AF0F42CB4900C2BC25 /* uc2_graphics.cpp */; }; - DD1194B20F42CB5400C2BC25 /* uc2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD1194B10F42CB5400C2BC25 /* uc2.cpp */; }; + DD0FAC13245ADFB60015D684 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD69ED6F2459A5840012014C /* IOSurface.framework */; }; + DD0FAC14245ADFF10015D684 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD69ED6F2459A5840012014C /* IOSurface.framework */; }; DD59379F164D16CE001D94A5 /* slide_show.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD08CB6F164CAC1A005B47DD /* slide_show.cpp */; }; DD5937A1164D16CE001D94A5 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E66094E56DB002CACC4 /* GLUT.framework */; }; DD5937A2164D16CE001D94A5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E67094E56DB002CACC4 /* OpenGL.framework */; }; DD5937A3164D16CE001D94A5 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E65094E56DB002CACC4 /* AppKit.framework */; }; - DD760E68094E56DB002CACC4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E65094E56DB002CACC4 /* AppKit.framework */; }; - DD760E69094E56DB002CACC4 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E66094E56DB002CACC4 /* GLUT.framework */; }; - DD760E6A094E56DB002CACC4 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E67094E56DB002CACC4 /* OpenGL.framework */; }; - DD84B667164CEA83008E1369 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E66094E56DB002CACC4 /* GLUT.framework */; }; - DD84B669164CEA87008E1369 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E67094E56DB002CACC4 /* OpenGL.framework */; }; - DD84B66A164CEB78008E1369 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E65094E56DB002CACC4 /* AppKit.framework */; }; - DD84C6DF0C856B36000EBEC4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E65094E56DB002CACC4 /* AppKit.framework */; }; - DD84C6E00C856B36000EBEC4 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E66094E56DB002CACC4 /* GLUT.framework */; }; - DD84C6E10C856B36000EBEC4 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E67094E56DB002CACC4 /* OpenGL.framework */; }; DDC4796715AC56CA0022401F /* uc2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD1194B10F42CB5400C2BC25 /* uc2.cpp */; }; DDC4796915AC56CA0022401F /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E65094E56DB002CACC4 /* AppKit.framework */; }; DDC4796A15AC56CA0022401F /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E66094E56DB002CACC4 /* GLUT.framework */; }; @@ -50,63 +37,16 @@ DDC479B015AC56EB0022401F /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E65094E56DB002CACC4 /* AppKit.framework */; }; DDC479B115AC56EB0022401F /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E66094E56DB002CACC4 /* GLUT.framework */; }; DDC479B215AC56EB0022401F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E67094E56DB002CACC4 /* OpenGL.framework */; }; - DDF8050515CB9C75005473CC /* ttfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDF8050315CB9C75005473CC /* ttfont.cpp */; }; DDF8050615CB9C75005473CC /* ttfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDF8050315CB9C75005473CC /* ttfont.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ - DD760E3C094E540C002CACC4 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.4_0; - fileType = sourcecode.asm; - isEditable = 1; - outputFiles = ( - ); - }; - DD760E3D094E540D002CACC4 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.4_0; - fileType = sourcecode.cpp; - isEditable = 1; - outputFiles = ( - ); - }; - DD760E3E094E540D002CACC4 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.4_0; - fileType = sourcecode.c; - isEditable = 1; - outputFiles = ( - ); - }; - DD84C6E30C856B36000EBEC4 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.4_0; - fileType = sourcecode.c; - isEditable = 1; - outputFiles = ( - ); - }; - DD84C6E40C856B36000EBEC4 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.4_0; - fileType = sourcecode.cpp; - isEditable = 1; - outputFiles = ( - ); - }; - DD84C6E50C856B36000EBEC4 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.4_0; - fileType = sourcecode.asm; - isEditable = 1; - outputFiles = ( - ); - }; DDC4796E15AC56CA0022401F /* PBXBuildRule */ = { isa = PBXBuildRule; compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.c; + inputFiles = ( + ); isEditable = 1; outputFiles = ( ); @@ -115,6 +55,8 @@ isa = PBXBuildRule; compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.cpp; + inputFiles = ( + ); isEditable = 1; outputFiles = ( ); @@ -123,6 +65,8 @@ isa = PBXBuildRule; compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.asm; + inputFiles = ( + ); isEditable = 1; outputFiles = ( ); @@ -131,6 +75,8 @@ isa = PBXBuildRule; compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.c; + inputFiles = ( + ); isEditable = 1; outputFiles = ( ); @@ -139,6 +85,8 @@ isa = PBXBuildRule; compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.cpp; + inputFiles = ( + ); isEditable = 1; outputFiles = ( ); @@ -147,6 +95,8 @@ isa = PBXBuildRule; compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.asm; + inputFiles = ( + ); isEditable = 1; outputFiles = ( ); @@ -161,27 +111,6 @@ remoteGlobalIDString = DD59379D164D16CE001D94A5; remoteInfo = "slide_show-x86_64"; }; - DD84B697164D0151008E1369 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = DD08CB63164CAAFF005B47DD; - remoteInfo = slide_show; - }; - DD84C71F0C856DA6000EBEC4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8DD76FA90486AB0100D96B5E; - remoteInfo = UC2; - }; - DD84C7210C856DA6000EBEC4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = DD84C6A70C856B36000EBEC4; - remoteInfo = UC2Gfx; - }; DDC479BD15AC57BC0022401F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; @@ -199,17 +128,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 8DD76FB20486AB0100D96B5E /* uc2_i686-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "uc2_i686-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; - DD08CB64164CAAFF005B47DD /* slide_show_i686-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "slide_show_i686-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; DD08CB6F164CAC1A005B47DD /* slide_show.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slide_show.cpp; path = ../example_app/slide_show.cpp; sourceTree = ""; }; DD1194AE0F42CAF400C2BC25 /* checkin_notes_samples */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = checkin_notes_samples; path = ../../checkin_notes_samples; sourceTree = SOURCE_ROOT; }; DD1194AF0F42CB4900C2BC25 /* uc2_graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = uc2_graphics.cpp; path = ../example_app/uc2_graphics.cpp; sourceTree = SOURCE_ROOT; }; DD1194B10F42CB5400C2BC25 /* uc2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = uc2.cpp; path = ../example_app/uc2.cpp; sourceTree = SOURCE_ROOT; }; DD5937A8164D16CE001D94A5 /* slide_show_x86_64-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "slide_show_x86_64-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; + DD69ED6F2459A5840012014C /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = IOSurface.framework; sourceTree = ""; }; DD760E65094E56DB002CACC4 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; DD760E66094E56DB002CACC4 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = ""; }; DD760E67094E56DB002CACC4 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; - DD84C6EA0C856B36000EBEC4 /* uc2_graphics_i686-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "uc2_graphics_i686-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; DD84C6F90C856C0E000EBEC4 /* uc2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = uc2.h; path = ../example_app/uc2.h; sourceTree = SOURCE_ROOT; }; DDC4797515AC56CA0022401F /* UC2_x86_64-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "UC2_x86_64-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; DDC479BB15AC56EB0022401F /* UC2_graphics_x86_64-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "UC2_graphics_x86_64-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -218,46 +145,17 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 8DD76FAD0486AB0100D96B5E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DD760E68094E56DB002CACC4 /* AppKit.framework in Frameworks */, - DD760E69094E56DB002CACC4 /* GLUT.framework in Frameworks */, - DD760E6A094E56DB002CACC4 /* OpenGL.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DD08CB61164CAAFF005B47DD /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DD84B667164CEA83008E1369 /* GLUT.framework in Frameworks */, - DD84B669164CEA87008E1369 /* OpenGL.framework in Frameworks */, - DD84B66A164CEB78008E1369 /* AppKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DD5937A0164D16CE001D94A5 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + DD0FAC14245ADFF10015D684 /* IOSurface.framework in Frameworks */, DD5937A1164D16CE001D94A5 /* GLUT.framework in Frameworks */, DD5937A2164D16CE001D94A5 /* OpenGL.framework in Frameworks */, DD5937A3164D16CE001D94A5 /* AppKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DD84C6DE0C856B36000EBEC4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DD84C6DF0C856B36000EBEC4 /* AppKit.framework in Frameworks */, - DD84C6E00C856B36000EBEC4 /* GLUT.framework in Frameworks */, - DD84C6E10C856B36000EBEC4 /* OpenGL.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DDC4796815AC56CA0022401F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -272,6 +170,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + DD0FAC13245ADFB60015D684 /* IOSurface.framework in Frameworks */, DDC479B015AC56EB0022401F /* AppKit.framework in Frameworks */, DDC479B115AC56EB0022401F /* GLUT.framework in Frameworks */, DDC479B215AC56EB0022401F /* OpenGL.framework in Frameworks */, @@ -307,11 +206,8 @@ 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8DD76FB20486AB0100D96B5E /* uc2_i686-apple-darwin */, - DD84C6EA0C856B36000EBEC4 /* uc2_graphics_i686-apple-darwin */, DDC4797515AC56CA0022401F /* UC2_x86_64-apple-darwin */, DDC479BB15AC56EB0022401F /* UC2_graphics_x86_64-apple-darwin */, - DD08CB64164CAAFF005B47DD /* slide_show_i686-apple-darwin */, DD5937A8164D16CE001D94A5 /* slide_show_x86_64-apple-darwin */, ); name = Products; @@ -331,6 +227,7 @@ DD760E65094E56DB002CACC4 /* AppKit.framework */, DD760E66094E56DB002CACC4 /* GLUT.framework */, DD760E67094E56DB002CACC4 /* OpenGL.framework */, + DD69ED6F2459A5840012014C /* IOSurface.framework */, ); name = "External Frameworks and Libraries"; sourceTree = ""; @@ -347,44 +244,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8DD76FA90486AB0100D96B5E /* UC2-i386 */ = { - isa = PBXNativeTarget; - buildConfigurationList = DD6341000973C81800B1057F /* Build configuration list for PBXNativeTarget "UC2-i386" */; - buildPhases = ( - 8DD76FAB0486AB0100D96B5E /* Sources */, - 8DD76FAD0486AB0100D96B5E /* Frameworks */, - DD7A737915AD66AB004F2841 /* ShellScript */, - ); - buildRules = ( - DD760E3E094E540D002CACC4 /* PBXBuildRule */, - DD760E3D094E540D002CACC4 /* PBXBuildRule */, - DD760E3C094E540C002CACC4 /* PBXBuildRule */, - ); - dependencies = ( - ); - name = "UC2-i386"; - productInstallPath = "$(HOME)/bin"; - productName = UpperCase; - productReference = 8DD76FB20486AB0100D96B5E /* uc2_i686-apple-darwin */; - productType = "com.apple.product-type.tool"; - }; - DD08CB63164CAAFF005B47DD /* slide_show-i386 */ = { - isa = PBXNativeTarget; - buildConfigurationList = DD08CB6D164CAAFF005B47DD /* Build configuration list for PBXNativeTarget "slide_show-i386" */; - buildPhases = ( - DD08CB60164CAAFF005B47DD /* Sources */, - DD08CB61164CAAFF005B47DD /* Frameworks */, - DD59379C164D1657001D94A5 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "slide_show-i386"; - productName = slide_show; - productReference = DD08CB64164CAAFF005B47DD /* slide_show_i686-apple-darwin */; - productType = "com.apple.product-type.tool"; - }; DD59379D164D16CE001D94A5 /* slide_show-x86_64 */ = { isa = PBXNativeTarget; buildConfigurationList = DD5937A5164D16CE001D94A5 /* Build configuration list for PBXNativeTarget "slide_show-x86_64" */; @@ -402,27 +261,6 @@ productReference = DD5937A8164D16CE001D94A5 /* slide_show_x86_64-apple-darwin */; productType = "com.apple.product-type.tool"; }; - DD84C6A70C856B36000EBEC4 /* UC2Gfx-i386 */ = { - isa = PBXNativeTarget; - buildConfigurationList = DD84C6E60C856B36000EBEC4 /* Build configuration list for PBXNativeTarget "UC2Gfx-i386" */; - buildPhases = ( - DD84C6A80C856B36000EBEC4 /* Sources */, - DD84C6DE0C856B36000EBEC4 /* Frameworks */, - DD7A737A15AD66CA004F2841 /* ShellScript */, - ); - buildRules = ( - DD84C6E30C856B36000EBEC4 /* PBXBuildRule */, - DD84C6E40C856B36000EBEC4 /* PBXBuildRule */, - DD84C6E50C856B36000EBEC4 /* PBXBuildRule */, - ); - dependencies = ( - ); - name = "UC2Gfx-i386"; - productInstallPath = "$(HOME)/bin"; - productName = UpperCase; - productReference = DD84C6EA0C856B36000EBEC4 /* uc2_graphics_i686-apple-darwin */; - productType = "com.apple.product-type.tool"; - }; DDC4796515AC56CA0022401F /* UC2-x86_64 */ = { isa = PBXNativeTarget; buildConfigurationList = DDC4797115AC56CA0022401F /* Build configuration list for PBXNativeTarget "UC2-x86_64" */; @@ -487,30 +325,14 @@ projectRoot = ""; targets = ( DD84C71E0C856D9E000EBEC4 /* Build_All */, - 8DD76FA90486AB0100D96B5E /* UC2-i386 */, - DD84C6A70C856B36000EBEC4 /* UC2Gfx-i386 */, DDC4796515AC56CA0022401F /* UC2-x86_64 */, DDC4797715AC56EB0022401F /* UC2Gfx-x86_64 */, - DD08CB63164CAAFF005B47DD /* slide_show-i386 */, DD59379D164D16CE001D94A5 /* slide_show-x86_64 */, ); }; /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - DD59379C164D1657001D94A5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "mkdir -p \"${SRCROOT}/build/${CONFIGURATION}\"\nif [ \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" -nt \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}\" ]; then\n cp -fp \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}\"\n if [ \"$CONFIGURATION\" = \"Release\" ]; then\n rm -fR \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n cp -fpR \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.dSYM\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n fi\nfi\n"; - }; DD5937A4164D16CE001D94A5 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -524,32 +346,6 @@ shellPath = /bin/sh; shellScript = "mkdir -p \"${SRCROOT}/build/${CONFIGURATION}\"\nif [ \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" -nt \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}\" ]; then\n cp -fp \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}\"\n if [ \"$CONFIGURATION\" = \"Release\" ]; then\n rm -fR \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n cp -fpR \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.dSYM\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n fi\nfi\n"; }; - DD7A737915AD66AB004F2841 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "mkdir -p \"${SRCROOT}/build/${CONFIGURATION}\"\nif [ \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" -nt \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}\" ]; then\n cp -fp \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}\"\n if [ \"$CONFIGURATION\" = \"Release\" ]; then\n rm -fR \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n cp -fpR \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.dSYM\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n fi\nfi\n"; - }; - DD7A737A15AD66CA004F2841 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "mkdir -p \"${SRCROOT}/build/${CONFIGURATION}\"\nif [ \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" -nt \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}\" ]; then\n cp -fp \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}\"\n if [ \"$CONFIGURATION\" = \"Release\" ]; then\n rm -fR \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n cp -fpR \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.dSYM\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n fi\nfi\n"; - }; DD7A737B15AD66D8004F2841 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -579,22 +375,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 8DD76FAB0486AB0100D96B5E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DD1194B20F42CB5400C2BC25 /* uc2.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DD08CB60164CAAFF005B47DD /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DD08CB70164CAC1A005B47DD /* slide_show.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DD59379E164D16CE001D94A5 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -603,15 +383,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DD84C6A80C856B36000EBEC4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DD1194B00F42CB4900C2BC25 /* uc2_graphics.cpp in Sources */, - DDF8050515CB9C75005473CC /* ttfont.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DDC4796615AC56CA0022401F /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -637,21 +408,6 @@ target = DD59379D164D16CE001D94A5 /* slide_show-x86_64 */; targetProxy = DD5937AA164D1759001D94A5 /* PBXContainerItemProxy */; }; - DD84B698164D0151008E1369 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DD08CB63164CAAFF005B47DD /* slide_show-i386 */; - targetProxy = DD84B697164D0151008E1369 /* PBXContainerItemProxy */; - }; - DD84C7200C856DA6000EBEC4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8DD76FA90486AB0100D96B5E /* UC2-i386 */; - targetProxy = DD84C71F0C856DA6000EBEC4 /* PBXContainerItemProxy */; - }; - DD84C7220C856DA6000EBEC4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DD84C6A70C856B36000EBEC4 /* UC2Gfx-i386 */; - targetProxy = DD84C7210C856DA6000EBEC4 /* PBXContainerItemProxy */; - }; DDC479BE15AC57BC0022401F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = DDC4796515AC56CA0022401F /* UC2-x86_64 */; @@ -665,87 +421,18 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - DD08CB6B164CAAFF005B47DD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - ../.., - ../../lib, - ../../api, - ../../zip, - ); - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; - MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc_graphics2", - "-lboinc", - "-ljpeg", - "-lboinc_zip", - ); - PRODUCT_NAME = "slide_show_i686-apple-darwin"; - }; - name = Debug; - }; - DD08CB6C164CAAFF005B47DD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - ../.., - ../../lib, - ../../api, - ../../zip, - ); - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - MACOSX_DEPLOYMENT_TARGET = 10.7; - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc_graphics2", - "-lboinc", - "-ljpeg", - "-lboinc_zip", - ); - PRODUCT_NAME = "slide_show_i686-apple-darwin"; - }; - name = Release; - }; DD5937A6164D16CE001D94A5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); GCC_CHAR_IS_UNSIGNED_CHAR = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -764,10 +451,14 @@ ../../lib, ../../api, ../../zip, + ../../clientgui/mac, ); LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = ( + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", + "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + ); OTHER_LDFLAGS = ( "-lboinc_api", "-lboinc_graphics2", @@ -785,8 +476,13 @@ ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); GCC_CHAR_IS_UNSIGNED_CHAR = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -799,9 +495,13 @@ ../../lib, ../../api, ../../zip, + ../../clientgui/mac, ); LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", + "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + ); OTHER_LDFLAGS = ( "-lboinc_api", "-lboinc_graphics2", @@ -813,37 +513,13 @@ }; name = Release; }; - DD6341010973C81800B1057F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - ../.., - ../../lib, - ../../api, - ../../clientgui/mac, - ); - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; - PREBINDING = NO; - PRODUCT_NAME = "uc2_i686-apple-darwin"; - ZERO_LINK = NO; - }; - name = Debug; - }; DD6341050973C81800B1057F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CFLAGS = ( "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", @@ -854,38 +530,17 @@ ); SDKROOT = macosx; STRIP_INSTALLED_PRODUCT = NO; + VALID_ARCHS = x86_64; }; name = Debug; }; - DD63410B0973C84A00B1057F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_MODEL_TUNING = G5; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - ../.., - ../../lib, - ../../api, - ../../clientgui/mac, - ); - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - PREBINDING = NO; - PRODUCT_NAME = "uc2_i686-apple-darwin"; - ZERO_LINK = NO; - }; - name = Release; - }; DD63410C0973C84A00B1057F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CFLAGS = ( "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", @@ -896,102 +551,7 @@ ); SDKROOT = macosx; STRIP_INSTALLED_PRODUCT = YES; - }; - name = Release; - }; - DD84C6E70C856B36000EBEC4 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "../../../freetype-2.4.10/include", - "../../../ftgl-2.1.3~rc5/src", - ../.., - ../../lib, - ../../api, - ); - INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", - "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", - "-DHAVE_STDLIB_H", - ); - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc_graphics2", - "-lboinc", - "-ljpeg", - "../../../freetype-2.4.10/objs/.libs/libfreetype.a", - "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", - "-lz", - "-lbz2", - ); - PREBINDING = NO; - PRODUCT_NAME = "uc2_graphics_i686-apple-darwin"; - WARNING_LDFLAGS = ( - "-lboinc_api", - "-lboinc_graphics2", - "-lboinc", - "../../../freetype-2.4.10/objs/.libs/libfreetype.a", - "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", - "-lbz2", - ); - ZERO_LINK = NO; - }; - name = Debug; - }; - DD84C6E90C856B36000EBEC4 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_MODEL_TUNING = G5; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "../../../freetype-2.4.10/include", - "../../../ftgl-2.1.3~rc5/src", - ../.., - ../../lib, - ../../api, - ); - INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", - "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", - "-DHAVE_STDLIB_H", - ); - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc_graphics2", - "-lboinc", - "-ljpeg", - "../../../freetype-2.4.10/objs/.libs/libfreetype.a", - "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", - "-lz", - "-lbz2", - ); - PREBINDING = NO; - PRODUCT_NAME = "uc2_graphics_i686-apple-darwin"; - WARNING_LDFLAGS = ( - "-lboinc_api", - "-lboinc_graphics2", - "-lboinc", - "../../../freetype-2.4.10/objs/.libs/libfreetype.a", - "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", - "-lbz2", - ); - ZERO_LINK = NO; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -1017,6 +577,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LIBRARY = "libc++"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; @@ -1032,6 +593,10 @@ ../../clientgui/mac, ); LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; + OTHER_CFLAGS = ( + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", + "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + ); PREBINDING = NO; PRODUCT_NAME = "UC2_x86_64-apple-darwin"; ZERO_LINK = NO; @@ -1042,6 +607,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LIBRARY = "libc++"; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_MODEL_TUNING = G5; @@ -1055,6 +621,10 @@ ../../clientgui/mac, ); LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; + OTHER_CFLAGS = ( + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", + "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + ); PREBINDING = NO; PRODUCT_NAME = "UC2_x86_64-apple-darwin"; ZERO_LINK = NO; @@ -1065,6 +635,11 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LIBRARY = "libc++"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; @@ -1079,6 +654,7 @@ ../.., ../../lib, ../../api, + ../../clientgui/mac, ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; @@ -1107,6 +683,11 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LIBRARY = "libc++"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_MODEL_TUNING = G5; @@ -1119,6 +700,7 @@ ../.., ../../lib, ../../api, + ../../clientgui/mac, ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; @@ -1146,15 +728,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DD08CB6D164CAAFF005B47DD /* Build configuration list for PBXNativeTarget "slide_show-i386" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DD08CB6B164CAAFF005B47DD /* Debug */, - DD08CB6C164CAAFF005B47DD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; DD5937A5164D16CE001D94A5 /* Build configuration list for PBXNativeTarget "slide_show-x86_64" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1164,15 +737,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - DD6341000973C81800B1057F /* Build configuration list for PBXNativeTarget "UC2-i386" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DD6341010973C81800B1057F /* Debug */, - DD63410B0973C84A00B1057F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; DD6341040973C81800B1057F /* Build configuration list for PBXProject "UpperCase2" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1182,15 +746,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - DD84C6E60C856B36000EBEC4 /* Build configuration list for PBXNativeTarget "UC2Gfx-i386" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DD84C6E70C856B36000EBEC4 /* Debug */, - DD84C6E90C856B36000EBEC4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; DD84C7280C856DBB000EBEC4 /* Build configuration list for PBXAggregateTarget "Build_All" */ = { isa = XCConfigurationList; buildConfigurations = (