diff --git a/checkin_notes b/checkin_notes index 2dbab09474..09e43efc62 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4833,3 +4833,24 @@ David 10 July 2012 edit_forum_preferences*.php forum_reply.php forum_thread.php + +Charlie 11 July 2012 + - Mac: update sample code to allow building with Xcode 4.3 and + to eliminate compiler warnings. + + samples/ + example_app/ + MakeMacExample.sh + Makefile_mac + Makefile_mac2 + uc_graphics.cpp + mac_build/ + UpperCase2.xcodeproj/ + project.pbxproj + vboxwrapper/ + BuildMacVboxWrapper.sh (new) + Makefile_mac (new) + vboxwrapper.xcodeproj/ + project.pbxproj + wrapper/ + BuildMacWrapper.sh diff --git a/samples/example_app/MakeMacExample.sh b/samples/example_app/MakeMacExample.sh index 9741a11e0d..28442d58ae 100644 --- a/samples/example_app/MakeMacExample.sh +++ b/samples/example_app/MakeMacExample.sh @@ -22,6 +22,13 @@ # # by Charlie Fenton 2/16/10 # Updated 10/11/10 for XCode 3.2 and OS 10.6 +# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address +# +## This script requires OS 10.6 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 +## complete the Xcode installation before running this script. # ## First, build the BOINC libraries using boinc/mac_build/BuildMacBOINC.sh ## @@ -31,31 +38,39 @@ ## sh [path]/MakeMacExample.sh ## -rm -fR ppc i386 x86_64 +GCCPATH=`xcrun -find gcc` +if [ $? -ne 0 ]; then + echo "ERROR: can't find gcc compiler" + return 1 +fi -echo -echo "***************************************************" -echo "********** Building PowerPC Application ***********" -echo "***************************************************" -echo +GPPPATH=`xcrun -find g++` +if [ $? -ne 0 ]; then + echo "ERROR: can't find g++ compiler" + return 1 +fi -export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export MACOSX_DEPLOYMENT_TARGET=10.3 -export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk,-arch,ppc" -export VARIANTFLAGS="-arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -fvisibility=hidden -fvisibility-inlines-hidden" +MAKEPATH=`xcrun -find make` +if [ $? -ne 0 ]; then + echo "ERROR: can't find make tool" + return 1 +fi +TOOLSPATH1=${MAKEPATH%/make} -rm -f uc2.o -rm -f uc2_graphics.o -rm -f uc2 -rm -f uc2_graphics -make -f Makefile_mac all +ARPATH=`xcrun -find ar` +if [ $? -ne 0 ]; then + echo "ERROR: can't find ar tool" + return 1 +fi -if [ $? -ne 0 ]; then exit 1; fi +TOOLSPATH2=${ARPATH%/ar} -mkdir ppc -mv uc2 ppc/ -mv uc2_graphics ppc/ +export PATH="${TOOLSPATH1}":"${TOOLSPATH2}":/usr/local/bin:$PATH + +SDKPATH=`xcodebuild -version -sdk macosx Path` + +rm -fR i386 x86_64 echo echo "***************************************************" @@ -63,10 +78,11 @@ 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 -export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk,-arch,i386" -export VARIANTFLAGS="-arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -fvisibility=hidden -fvisibility-inlines-hidden" rm -f uc2.o rm -f uc2_graphics.o @@ -86,10 +102,11 @@ echo "******* Building 64-bit Intel Application *********" echo "***************************************************" 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 SDKROOT="${SDKPATH}" export MACOSX_DEPLOYMENT_TARGET=10.5 -export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk,-arch,x86_64" -export VARIANTFLAGS="-arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1050 -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 -isysroot /Developer/SDKs/MacOSX10.5.sdk -fvisibility=hidden -fvisibility-inlines-hidden" rm -f uc2.o rm -f uc2_graphics.o diff --git a/samples/example_app/Makefile_mac b/samples/example_app/Makefile_mac index bfc96d4caa..074cf9f7be 100644 --- a/samples/example_app/Makefile_mac +++ b/samples/example_app/Makefile_mac @@ -1,7 +1,7 @@ # makefile for uc2 BOINC example application on Macintosh. # This is invoked from MakeMacExample.sh shell script. # It should not be used by itself without the script. -# Updated 2/16/10 for OS 10.6 and XCode 3.2 +# Updated 7/10/12 for OS 10.7 and XCode 4.3 and later BOINC_DIR = ../.. BOINC_API_DIR = $(BOINC_DIR)/api @@ -20,8 +20,6 @@ CXXFLAGS = $(VARIANTFLAGS) \ -L$(BOINC_BUILD_DIR) \ -L. -LIBJPEG = ../../../jpeg-6b/libjpeg.a - OBJ = \ uc2.o \ uc2_graphics.o @@ -38,6 +36,6 @@ uc2: uc2.o $(BOINC_BUILD_DIR)/libboinc_api.a $(BOINC_BUILD_DIR)/libboinc.a uc2_graphics: uc2_graphics.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_graphics2.a $(CXX) $(CXXFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o\ - -lboinc_graphics2 -lboinc_api -lboinc \ - -framework AppKit -framework GLUT -framework OpenGL $(LIBJPEG) + -lboinc_graphics2 -lboinc_api -lboinc -ljpeg\ + -framework AppKit -framework GLUT -framework OpenGL \ No newline at end of file diff --git a/samples/example_app/Makefile_mac2 b/samples/example_app/Makefile_mac2 index 27644c5fe5..cdbdeeaded 100644 --- a/samples/example_app/Makefile_mac2 +++ b/samples/example_app/Makefile_mac2 @@ -1,5 +1,5 @@ # stand-alone makefile for uc2 BOINC example application on Macintosh. -# Updated 10/8/10 for OS 10.6 and XCode 3.2 +# Updated 7/11/12 for OS 10.7 and XCode 4.3 # BOINC_DIR = ../.. @@ -17,97 +17,63 @@ CXXFLAGS_ALL = \ -I$(BOINC_LIB_DIR) \ -I$(BOINC_API_DIR) \ -L$(BOINC_BUILD_DIR) \ + -L/usr/lib \ -L. -CC_PPC = /usr/bin/gcc-4.0 -CXX_PPC = /usr/bin/g++-4.0 -CXXFLAGS_PPC = -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030 \ - -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ - $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_PPC = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk,-arch,ppc - - -CC_i386 = /usr/bin/gcc-4.0 -CXX_i386 = /usr/bin/g++-4.0 CXXFLAGS_i386 = -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \ - -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_i386 = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk,-arch,i386 +LDFLAGS_i386 = -Wl,,-arch,i386 -CC_x86_64 = /usr/bin/gcc-4.0 -CXX_x86_64 = /usr/bin/g++-4.0 CXXFLAGS_x86_64 = -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1050 -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \ - -isysroot /Developer/SDKs/MacOSX10.5.sdk \ $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_x86_64 = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk,-arch,x86_64 +LDFLAGS_x86_64 = -Wl,-arch,x86_64 -LIBJPEG = ../../../jpeg-6b/libjpeg.a - OBJ = \ - uc2_ppc.o \ - uc2_graphics_ppc.o \ uc2_i386.o \ uc2_graphics_i386.o \ uc2_x86_64.o \ uc2_graphics_x86_64.o \ -PROGS = uc2_ppc uc2_graphics_ppc uc2_i386 uc2_graphics_i386 uc2_x86_64 uc2_graphics_x86_64 +PROGS = uc2_i386 uc2_graphics_i386 uc2_x86_64 uc2_graphics_x86_64 all: $(PROGS) clean: /bin/rm -f $(PROGS) $(OBJ) -uc2_ppc: export MACOSX_DEPLOYMENT_TARGET=10.3 -uc2_graphics_ppc: export MACOSX_DEPLOYMENT_TARGET=10.3 uc2_i386: export MACOSX_DEPLOYMENT_TARGET=10.4 uc2_graphics_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 -uc2_ppc.o: uc2.cpp - $(CXX_PPC) -c $(CXXFLAGS_PPC) uc2.cpp -o uc2_ppc.o - -uc2_graphics_ppc.o: uc2_graphics.cpp - $(CXX_PPC) -c $(CXXFLAGS_PPC) uc2_graphics.cpp -o uc2_graphics_ppc.o - target uc2_i386.0: MACOSX_DEPLOYMENT_TARGET=10.4 uc2_i386.o: uc2.cpp - $(CXX_i386) -c $(CXXFLAGS_i386) uc2.cpp -o uc2_i386.o + $(CXX) -c $(CXXFLAGS_i386) uc2.cpp -o uc2_i386.o uc2_graphics_i386.o: uc2_graphics.cpp - $(CXX_i386) -c $(CXXFLAGS_i386) uc2_graphics.cpp -o uc2_graphics_i386.o + $(CXX) -c $(CXXFLAGS_i386) uc2_graphics.cpp -o uc2_graphics_i386.o target uc2_x86_64: MACOSX_DEPLOYMENT_TARGET=10.5 uc2_x86_64.o: uc2.cpp - $(CXX_x86_64) -c $(CXXFLAGS_x86_64) uc2.cpp -o uc2_x86_64.o + $(CXX) -c $(CXXFLAGS_x86_64) uc2.cpp -o uc2_x86_64.o uc2_graphics_x86_64.o: uc2_graphics.cpp - $(CXX_x86_64) -c $(CXXFLAGS_x86_64) uc2_graphics.cpp -o uc2_graphics_x86_64.o - - -uc2_ppc: uc2_ppc.o $(BOINC_BUILD_DIR)/libboinc_api.a $(BOINC_BUILD_DIR)/libboinc.a - $(CXX_PPC) $(CXXFLAGS_PPC) $(LDFLAGS_PPC) -o uc2_ppc uc2_ppc.o -lboinc_api -lboinc - -uc2_graphics_ppc: uc2_graphics_ppc.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_graphics2.a - $(CXX_PPC) $(CXXFLAGS_PPC) $(LDFLAGS_PPC) -o uc2_graphics_ppc uc2_graphics_ppc.o\ - -lboinc_graphics2 -lboinc_api -lboinc \ - -framework AppKit -framework GLUT -framework OpenGL $(LIBJPEG) + $(CXX) -c $(CXXFLAGS_x86_64) uc2_graphics.cpp -o uc2_graphics_x86_64.o uc2_i386: uc2_i386.o $(BOINC_BUILD_DIR)/libboinc_api.a $(BOINC_BUILD_DIR)/libboinc.a - $(CXX_i386) $(CXXFLAGS_i386) $(LDFLAGS_i386) -o uc2_i386 uc2_i386.o -lboinc_api -lboinc + $(CXX) $(CXXFLAGS_i386) $(LDFLAGS_i386) -o uc2_i386 uc2_i386.o -lboinc_api -lboinc uc2_graphics_i386: uc2_graphics_i386.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_graphics2.a - $(CXX_i386) $(CXXFLAGS_i386) $(LDFLAGS_i386) -o uc2_graphics_i386 uc2_graphics_i386.o\ - -lboinc_graphics2 -lboinc_api -lboinc \ - -framework AppKit -framework GLUT -framework OpenGL $(LIBJPEG) + $(CXX) $(CXXFLAGS_i386) $(LDFLAGS_i386) -o uc2_graphics_i386 uc2_graphics_i386.o\ + -lboinc_graphics2 -lboinc_api -lboinc -ljpeg \ + -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_x86_64) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_x86_64 uc2_x86_64.o -lboinc_api -lboinc + $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_x86_64 uc2_x86_64.o -lboinc_api -lboinc uc2_graphics_x86_64: uc2_graphics_x86_64.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_graphics2.a - $(CXX_x86_64) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_graphics_x86_64 uc2_graphics_x86_64.o\ - -lboinc_graphics2 -lboinc_api -lboinc \ - -framework AppKit -framework GLUT -framework OpenGL $(LIBJPEG) + $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_graphics_x86_64 uc2_graphics_x86_64.o\ + -lboinc_graphics2 -lboinc_api -lboinc -ljpeg \ + -framework AppKit -framework GLUT -framework OpenGL diff --git a/samples/example_app/uc2_graphics.cpp b/samples/example_app/uc2_graphics.cpp index 4bf5fdf59c..85ffca5285 100644 --- a/samples/example_app/uc2_graphics.cpp +++ b/samples/example_app/uc2_graphics.cpp @@ -101,12 +101,12 @@ static void draw_text() { if (dt > 10) { boinc_close_window_and_quit("shmem not updated"); } else if (dt > 5) { - txf_render_string(.1, 0, 0, 0, 500, white, 0, "App not running - exiting in 5 seconds"); + txf_render_string(.1, 0, 0, 0, 500, white, 0, (char*)"App not running - exiting in 5 seconds"); } else if (shmem->status.suspended) { - txf_render_string(.1, 0, 0, 0, 500, white, 0, "App suspended"); + txf_render_string(.1, 0, 0, 0, 500, white, 0, (char*)"App suspended"); } } else { - txf_render_string(.1, 0, 0, 0, 500, white, 0, "No shared mem"); + txf_render_string(.1, 0, 0, 0, 500, white, 0, (char*)"No shared mem"); } } @@ -236,9 +236,9 @@ void app_graphics_init() { glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - txf_load_fonts("."); + txf_load_fonts((char*)"."); - boinc_resolve_filename("logo.jpg", path, sizeof(path)); + boinc_resolve_filename((char*)"logo.jpg", path, sizeof(path)); logo.load_image_file(path); init_lights(); diff --git a/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj b/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj index b162c841ca..460da54096 100644 --- a/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj +++ b/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj @@ -13,6 +13,8 @@ buildPhases = ( ); dependencies = ( + DDC479C015AC57C40022401F /* PBXTargetDependency */, + DDC479BE15AC57BC0022401F /* PBXTargetDependency */, DD84C7200C856DA6000EBEC4 /* PBXTargetDependency */, DD84C7220C856DA6000EBEC4 /* PBXTargetDependency */, ); @@ -83,7 +85,67 @@ 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 */; }; - DD84C6FB0C856C0E000EBEC4 /* uc2.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DD84C6F90C856C0E000EBEC4 /* uc2.h */; }; + 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 */; }; + DDC4796B15AC56CA0022401F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E67094E56DB002CACC4 /* OpenGL.framework */; }; + DDC4797915AC56EB0022401F /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F66A09EBA9710024857D /* jcapimin.c */; }; + DDC4797A15AC56EB0022401F /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F66B09EBA9710024857D /* jcapistd.c */; }; + DDC4797B15AC56EB0022401F /* jccoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F66C09EBA9710024857D /* jccoefct.c */; }; + DDC4797C15AC56EB0022401F /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F66D09EBA9710024857D /* jccolor.c */; }; + DDC4797D15AC56EB0022401F /* jcdctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F66E09EBA9710024857D /* jcdctmgr.c */; }; + DDC4797E15AC56EB0022401F /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F66F09EBA9710024857D /* jchuff.c */; }; + DDC4797F15AC56EB0022401F /* jcinit.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67109EBA9710024857D /* jcinit.c */; }; + DDC4798015AC56EB0022401F /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67209EBA9710024857D /* jcmainct.c */; }; + DDC4798115AC56EB0022401F /* jcmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67309EBA9710024857D /* jcmarker.c */; }; + DDC4798215AC56EB0022401F /* jcmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67409EBA9710024857D /* jcmaster.c */; }; + DDC4798315AC56EB0022401F /* jcomapi.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67509EBA9710024857D /* jcomapi.c */; }; + DDC4798415AC56EB0022401F /* jcparam.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67709EBA9710024857D /* jcparam.c */; }; + DDC4798515AC56EB0022401F /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67809EBA9710024857D /* jcphuff.c */; }; + DDC4798615AC56EB0022401F /* jcprepct.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67909EBA9710024857D /* jcprepct.c */; }; + DDC4798715AC56EB0022401F /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67A09EBA9710024857D /* jcsample.c */; }; + DDC4798815AC56EB0022401F /* jctrans.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67B09EBA9710024857D /* jctrans.c */; }; + DDC4798915AC56EB0022401F /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67C09EBA9710024857D /* jdapimin.c */; }; + DDC4798A15AC56EB0022401F /* jdapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67D09EBA9710024857D /* jdapistd.c */; }; + DDC4798B15AC56EB0022401F /* jdatadst.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67E09EBA9710024857D /* jdatadst.c */; }; + DDC4798C15AC56EB0022401F /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F67F09EBA9710024857D /* jdatasrc.c */; }; + DDC4798D15AC56EB0022401F /* jdcoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68009EBA9710024857D /* jdcoefct.c */; }; + DDC4798E15AC56EB0022401F /* jdcolor.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68109EBA9710024857D /* jdcolor.c */; }; + DDC4798F15AC56EB0022401F /* jddctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68309EBA9710024857D /* jddctmgr.c */; }; + DDC4799015AC56EB0022401F /* jdhuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68409EBA9710024857D /* jdhuff.c */; }; + DDC4799115AC56EB0022401F /* jdinput.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68609EBA9710024857D /* jdinput.c */; }; + DDC4799215AC56EB0022401F /* jdmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68709EBA9710024857D /* jdmainct.c */; }; + DDC4799315AC56EB0022401F /* jdmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68809EBA9710024857D /* jdmarker.c */; }; + DDC4799415AC56EB0022401F /* jdmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68909EBA9710024857D /* jdmaster.c */; }; + DDC4799515AC56EB0022401F /* jdmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68A09EBA9710024857D /* jdmerge.c */; }; + DDC4799615AC56EB0022401F /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68B09EBA9710024857D /* jdphuff.c */; }; + DDC4799715AC56EB0022401F /* jdpostct.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68C09EBA9710024857D /* jdpostct.c */; }; + DDC4799815AC56EB0022401F /* jdsample.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68D09EBA9710024857D /* jdsample.c */; }; + DDC4799915AC56EB0022401F /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68E09EBA9710024857D /* jdtrans.c */; }; + DDC4799A15AC56EB0022401F /* jerror.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F68F09EBA9710024857D /* jerror.c */; }; + DDC4799B15AC56EB0022401F /* jfdctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69109EBA9710024857D /* jfdctflt.c */; }; + DDC4799C15AC56EB0022401F /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69209EBA9710024857D /* jfdctfst.c */; }; + DDC4799D15AC56EB0022401F /* jfdctint.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69309EBA9710024857D /* jfdctint.c */; }; + DDC4799E15AC56EB0022401F /* jidctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69409EBA9710024857D /* jidctflt.c */; }; + DDC4799F15AC56EB0022401F /* jidctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69509EBA9710024857D /* jidctfst.c */; }; + DDC479A015AC56EB0022401F /* jidctint.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69609EBA9710024857D /* jidctint.c */; }; + DDC479A115AC56EB0022401F /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69709EBA9710024857D /* jidctred.c */; }; + DDC479A215AC56EB0022401F /* jmemmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69909EBA9710024857D /* jmemmgr.c */; }; + DDC479A315AC56EB0022401F /* jmemnobs.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69A09EBA9710024857D /* jmemnobs.c */; }; + DDC479A415AC56EB0022401F /* jquant1.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F69F09EBA9710024857D /* jquant1.c */; }; + DDC479A515AC56EB0022401F /* jquant2.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A009EBA9710024857D /* jquant2.c */; }; + DDC479A615AC56EB0022401F /* jutils.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A109EBA9710024857D /* jutils.c */; }; + DDC479A715AC56EB0022401F /* rdbmp.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A309EBA9710024857D /* rdbmp.c */; }; + DDC479A815AC56EB0022401F /* rdcolmap.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A409EBA9710024857D /* rdcolmap.c */; }; + DDC479A915AC56EB0022401F /* rdgif.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A509EBA9710024857D /* rdgif.c */; }; + DDC479AA15AC56EB0022401F /* rdppm.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A609EBA9710024857D /* rdppm.c */; }; + DDC479AB15AC56EB0022401F /* rdrle.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A709EBA9710024857D /* rdrle.c */; }; + DDC479AC15AC56EB0022401F /* rdswitch.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A809EBA9710024857D /* rdswitch.c */; }; + DDC479AD15AC56EB0022401F /* rdtarga.c in Sources */ = {isa = PBXBuildFile; fileRef = DD00F6A909EBA9710024857D /* rdtarga.c */; }; + DDC479AE15AC56EB0022401F /* uc2_graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD1194AF0F42CB4900C2BC25 /* uc2_graphics.cpp */; }; + 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 */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -135,6 +197,54 @@ outputFiles = ( ); }; + DDC4796E15AC56CA0022401F /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.4_0; + fileType = sourcecode.c; + isEditable = 1; + outputFiles = ( + ); + }; + DDC4796F15AC56CA0022401F /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.4_0; + fileType = sourcecode.cpp; + isEditable = 1; + outputFiles = ( + ); + }; + DDC4797015AC56CA0022401F /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.4_0; + fileType = sourcecode.asm; + isEditable = 1; + outputFiles = ( + ); + }; + DDC479B415AC56EB0022401F /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.4_0; + fileType = sourcecode.c; + isEditable = 1; + outputFiles = ( + ); + }; + DDC479B515AC56EB0022401F /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.4_0; + fileType = sourcecode.cpp; + isEditable = 1; + outputFiles = ( + ); + }; + DDC479B615AC56EB0022401F /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.4_0; + fileType = sourcecode.asm; + isEditable = 1; + outputFiles = ( + ); + }; /* End PBXBuildRule section */ /* Begin PBXContainerItemProxy section */ @@ -152,32 +262,24 @@ remoteGlobalIDString = DD84C6A70C856B36000EBEC4; remoteInfo = UC2Gfx; }; + DDC479BD15AC57BC0022401F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = DDC4796515AC56CA0022401F; + remoteInfo = "UC2-x86_64"; + }; + DDC479BF15AC57C40022401F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = DDC4797715AC56EB0022401F; + remoteInfo = "UC2Gfx-x86_64"; + }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 8DD76FAF0486AB0100D96B5E /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 8; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - DD84C6FB0C856C0E000EBEC4 /* uc2.h in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 1; - }; - DD84C6E20C856B36000EBEC4 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 8; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ - 8DD76FB20486AB0100D96B5E /* uc2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = uc2; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DD76FB20486AB0100D96B5E /* uc2_i686-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "uc2_i686-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; DD00F66809EBA9710024857D /* cderror.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = cderror.h; path = ../jpeglib/cderror.h; sourceTree = SOURCE_ROOT; }; DD00F66909EBA9710024857D /* cdjpeg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = cdjpeg.h; path = ../jpeglib/cdjpeg.h; sourceTree = SOURCE_ROOT; }; DD00F66A09EBA9710024857D /* jcapimin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../jpeglib/jcapimin.c; sourceTree = SOURCE_ROOT; }; @@ -250,8 +352,10 @@ 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 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = uc2_graphics; sourceTree = BUILT_PRODUCTS_DIR; }; + 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; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -275,6 +379,26 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DDC4796815AC56CA0022401F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DDC4796915AC56CA0022401F /* AppKit.framework in Frameworks */, + DDC4796A15AC56CA0022401F /* GLUT.framework in Frameworks */, + DDC4796B15AC56CA0022401F /* OpenGL.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + DDC479AF15AC56EB0022401F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DDC479B015AC56EB0022401F /* AppKit.framework in Frameworks */, + DDC479B115AC56EB0022401F /* GLUT.framework in Frameworks */, + DDC479B215AC56EB0022401F /* OpenGL.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -303,8 +427,10 @@ 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8DD76FB20486AB0100D96B5E /* uc2 */, - DD84C6EA0C856B36000EBEC4 /* uc2_graphics */, + 8DD76FB20486AB0100D96B5E /* uc2_i686-apple-darwin */, + DD84C6EA0C856B36000EBEC4 /* uc2_graphics_i686-apple-darwin */, + DDC4797515AC56CA0022401F /* UC2_x86_64-apple-darwin */, + DDC479BB15AC56EB0022401F /* UC2_graphics_x86_64-apple-darwin */, ); name = Products; sourceTree = ""; @@ -403,13 +529,13 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8DD76FA90486AB0100D96B5E /* UC2 */ = { + 8DD76FA90486AB0100D96B5E /* UC2-i386 */ = { isa = PBXNativeTarget; - buildConfigurationList = DD6341000973C81800B1057F /* Build configuration list for PBXNativeTarget "UC2" */; + buildConfigurationList = DD6341000973C81800B1057F /* Build configuration list for PBXNativeTarget "UC2-i386" */; buildPhases = ( 8DD76FAB0486AB0100D96B5E /* Sources */, 8DD76FAD0486AB0100D96B5E /* Frameworks */, - 8DD76FAF0486AB0100D96B5E /* CopyFiles */, + DD7A737915AD66AB004F2841 /* ShellScript */, ); buildRules = ( DD760E3E094E540D002CACC4 /* PBXBuildRule */, @@ -418,19 +544,19 @@ ); dependencies = ( ); - name = UC2; + name = "UC2-i386"; productInstallPath = "$(HOME)/bin"; productName = UpperCase; - productReference = 8DD76FB20486AB0100D96B5E /* uc2 */; + productReference = 8DD76FB20486AB0100D96B5E /* uc2_i686-apple-darwin */; productType = "com.apple.product-type.tool"; }; - DD84C6A70C856B36000EBEC4 /* UC2Gfx */ = { + DD84C6A70C856B36000EBEC4 /* UC2Gfx-i386 */ = { isa = PBXNativeTarget; - buildConfigurationList = DD84C6E60C856B36000EBEC4 /* Build configuration list for PBXNativeTarget "UC2Gfx" */; + buildConfigurationList = DD84C6E60C856B36000EBEC4 /* Build configuration list for PBXNativeTarget "UC2Gfx-i386" */; buildPhases = ( DD84C6A80C856B36000EBEC4 /* Sources */, DD84C6DE0C856B36000EBEC4 /* Frameworks */, - DD84C6E20C856B36000EBEC4 /* CopyFiles */, + DD7A737A15AD66CA004F2841 /* ShellScript */, ); buildRules = ( DD84C6E30C856B36000EBEC4 /* PBXBuildRule */, @@ -439,10 +565,52 @@ ); dependencies = ( ); - name = UC2Gfx; + name = "UC2Gfx-i386"; productInstallPath = "$(HOME)/bin"; productName = UpperCase; - productReference = DD84C6EA0C856B36000EBEC4 /* uc2_graphics */; + 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" */; + buildPhases = ( + DDC4796615AC56CA0022401F /* Sources */, + DDC4796815AC56CA0022401F /* Frameworks */, + DD7A737B15AD66D8004F2841 /* ShellScript */, + ); + buildRules = ( + DDC4796E15AC56CA0022401F /* PBXBuildRule */, + DDC4796F15AC56CA0022401F /* PBXBuildRule */, + DDC4797015AC56CA0022401F /* PBXBuildRule */, + ); + dependencies = ( + ); + name = "UC2-x86_64"; + productInstallPath = "$(HOME)/bin"; + productName = UpperCase; + productReference = DDC4797515AC56CA0022401F /* UC2_x86_64-apple-darwin */; + productType = "com.apple.product-type.tool"; + }; + DDC4797715AC56EB0022401F /* UC2Gfx-x86_64 */ = { + isa = PBXNativeTarget; + buildConfigurationList = DDC479B715AC56EB0022401F /* Build configuration list for PBXNativeTarget "UC2Gfx-x86_64" */; + buildPhases = ( + DDC4797815AC56EB0022401F /* Sources */, + DDC479AF15AC56EB0022401F /* Frameworks */, + DD7A737C15AD66E2004F2841 /* ShellScript */, + ); + buildRules = ( + DDC479B415AC56EB0022401F /* PBXBuildRule */, + DDC479B515AC56EB0022401F /* PBXBuildRule */, + DDC479B615AC56EB0022401F /* PBXBuildRule */, + ); + dependencies = ( + ); + name = "UC2Gfx-x86_64"; + productInstallPath = "$(HOME)/bin"; + productName = UpperCase; + productReference = DDC479BB15AC56EB0022401F /* UC2_graphics_x86_64-apple-darwin */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ @@ -465,12 +633,69 @@ projectRoot = ""; targets = ( DD84C71E0C856D9E000EBEC4 /* Build_All */, - 8DD76FA90486AB0100D96B5E /* UC2 */, - DD84C6A70C856B36000EBEC4 /* UC2Gfx */, + 8DD76FA90486AB0100D96B5E /* UC2-i386 */, + DD84C6A70C856B36000EBEC4 /* UC2Gfx-i386 */, + DDC4796515AC56CA0022401F /* UC2-x86_64 */, + DDC4797715AC56EB0022401F /* UC2Gfx-x86_64 */, ); }; /* End PBXProject section */ +/* Begin PBXShellScriptBuildPhase section */ + 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; + 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"; + }; + DD7A737C15AD66E2004F2841 /* 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"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 8DD76FAB0486AB0100D96B5E /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -541,100 +766,106 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DDC4796615AC56CA0022401F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DDC4796715AC56CA0022401F /* uc2.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + DDC4797815AC56EB0022401F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DDC4797915AC56EB0022401F /* jcapimin.c in Sources */, + DDC4797A15AC56EB0022401F /* jcapistd.c in Sources */, + DDC4797B15AC56EB0022401F /* jccoefct.c in Sources */, + DDC4797C15AC56EB0022401F /* jccolor.c in Sources */, + DDC4797D15AC56EB0022401F /* jcdctmgr.c in Sources */, + DDC4797E15AC56EB0022401F /* jchuff.c in Sources */, + DDC4797F15AC56EB0022401F /* jcinit.c in Sources */, + DDC4798015AC56EB0022401F /* jcmainct.c in Sources */, + DDC4798115AC56EB0022401F /* jcmarker.c in Sources */, + DDC4798215AC56EB0022401F /* jcmaster.c in Sources */, + DDC4798315AC56EB0022401F /* jcomapi.c in Sources */, + DDC4798415AC56EB0022401F /* jcparam.c in Sources */, + DDC4798515AC56EB0022401F /* jcphuff.c in Sources */, + DDC4798615AC56EB0022401F /* jcprepct.c in Sources */, + DDC4798715AC56EB0022401F /* jcsample.c in Sources */, + DDC4798815AC56EB0022401F /* jctrans.c in Sources */, + DDC4798915AC56EB0022401F /* jdapimin.c in Sources */, + DDC4798A15AC56EB0022401F /* jdapistd.c in Sources */, + DDC4798B15AC56EB0022401F /* jdatadst.c in Sources */, + DDC4798C15AC56EB0022401F /* jdatasrc.c in Sources */, + DDC4798D15AC56EB0022401F /* jdcoefct.c in Sources */, + DDC4798E15AC56EB0022401F /* jdcolor.c in Sources */, + DDC4798F15AC56EB0022401F /* jddctmgr.c in Sources */, + DDC4799015AC56EB0022401F /* jdhuff.c in Sources */, + DDC4799115AC56EB0022401F /* jdinput.c in Sources */, + DDC4799215AC56EB0022401F /* jdmainct.c in Sources */, + DDC4799315AC56EB0022401F /* jdmarker.c in Sources */, + DDC4799415AC56EB0022401F /* jdmaster.c in Sources */, + DDC4799515AC56EB0022401F /* jdmerge.c in Sources */, + DDC4799615AC56EB0022401F /* jdphuff.c in Sources */, + DDC4799715AC56EB0022401F /* jdpostct.c in Sources */, + DDC4799815AC56EB0022401F /* jdsample.c in Sources */, + DDC4799915AC56EB0022401F /* jdtrans.c in Sources */, + DDC4799A15AC56EB0022401F /* jerror.c in Sources */, + DDC4799B15AC56EB0022401F /* jfdctflt.c in Sources */, + DDC4799C15AC56EB0022401F /* jfdctfst.c in Sources */, + DDC4799D15AC56EB0022401F /* jfdctint.c in Sources */, + DDC4799E15AC56EB0022401F /* jidctflt.c in Sources */, + DDC4799F15AC56EB0022401F /* jidctfst.c in Sources */, + DDC479A015AC56EB0022401F /* jidctint.c in Sources */, + DDC479A115AC56EB0022401F /* jidctred.c in Sources */, + DDC479A215AC56EB0022401F /* jmemmgr.c in Sources */, + DDC479A315AC56EB0022401F /* jmemnobs.c in Sources */, + DDC479A415AC56EB0022401F /* jquant1.c in Sources */, + DDC479A515AC56EB0022401F /* jquant2.c in Sources */, + DDC479A615AC56EB0022401F /* jutils.c in Sources */, + DDC479A715AC56EB0022401F /* rdbmp.c in Sources */, + DDC479A815AC56EB0022401F /* rdcolmap.c in Sources */, + DDC479A915AC56EB0022401F /* rdgif.c in Sources */, + DDC479AA15AC56EB0022401F /* rdppm.c in Sources */, + DDC479AB15AC56EB0022401F /* rdrle.c in Sources */, + DDC479AC15AC56EB0022401F /* rdswitch.c in Sources */, + DDC479AD15AC56EB0022401F /* rdtarga.c in Sources */, + DDC479AE15AC56EB0022401F /* uc2_graphics.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ DD84C7200C856DA6000EBEC4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 8DD76FA90486AB0100D96B5E /* UC2 */; + target = 8DD76FA90486AB0100D96B5E /* UC2-i386 */; targetProxy = DD84C71F0C856DA6000EBEC4 /* PBXContainerItemProxy */; }; DD84C7220C856DA6000EBEC4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DD84C6A70C856B36000EBEC4 /* UC2Gfx */; + target = DD84C6A70C856B36000EBEC4 /* UC2Gfx-i386 */; targetProxy = DD84C7210C856DA6000EBEC4 /* PBXContainerItemProxy */; }; + DDC479BE15AC57BC0022401F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DDC4796515AC56CA0022401F /* UC2-x86_64 */; + targetProxy = DDC479BD15AC57BC0022401F /* PBXContainerItemProxy */; + }; + DDC479C015AC57C40022401F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DDC4797715AC56EB0022401F /* UC2Gfx-x86_64 */; + targetProxy = DDC479BF15AC57C40022401F /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - DD0E8F180CFD704700973F10 /* x86_64_Deployment */ = { + DD6341010973C81800B1057F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; - GCC_VERSION = 4.0; - MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1050", - "-DMAC_OS_X_VERSION_MIN_REQUIRED=1050", - ); - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc", - ); - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; - }; - name = x86_64_Deployment; - }; - DD0E8F190CFD704700973F10 /* x86_64_Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = Build_All; - }; - name = x86_64_Deployment; - }; - DD0E8F1A0CFD704700973F10 /* x86_64_Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = x86_64; - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = 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 = "../../**"; - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - PREBINDING = NO; - PRODUCT_NAME = uc2; - ZERO_LINK = NO; - }; - name = x86_64_Deployment; - }; - DD0E8F1B0CFD704700973F10 /* x86_64_Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = x86_64; - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = 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 = "../../**"; - INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc_graphics2", - "-lboinc", - ); - PREBINDING = NO; - PRODUCT_NAME = uc2_graphics; - ZERO_LINK = NO; - }; - name = x86_64_Deployment; - }; - DD6341010973C81800B1057F /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -644,109 +875,77 @@ HEADER_SEARCH_PATHS = "../../**"; LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; PREBINDING = NO; - PRODUCT_NAME = uc2; + PRODUCT_NAME = "uc2_i686-apple-darwin"; ZERO_LINK = NO; }; - name = Development; + name = Debug; }; - DD6341020973C81800B1057F /* ppc_Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = 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 = "../../**"; - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - PREBINDING = NO; - PRODUCT_NAME = uc2; - ZERO_LINK = NO; - }; - name = ppc_Deployment; - }; - DD6341050973C81800B1057F /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = 4.0; - MACOSX_DEPLOYMENT_TARGET = 10.4; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", - "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", - ); - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc", - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Development; - }; - DD6341060973C81800B1057F /* ppc_Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ppc; - GCC_VERSION = 4.0; - MACOSX_DEPLOYMENT_TARGET = 10.3; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", - "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", - ); - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc", - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = ppc_Deployment; - }; - DD63410B0973C84A00B1057F /* i386_Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = 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 = "../../**"; - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - PREBINDING = NO; - PRODUCT_NAME = uc2; - ZERO_LINK = NO; - }; - name = i386_Deployment; - }; - DD63410C0973C84A00B1057F /* i386_Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = i386; - GCC_VERSION = 4.0; - MACOSX_DEPLOYMENT_TARGET = 10.4; - OTHER_CFLAGS = ( - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", - "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", - ); - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc", - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = i386_Deployment; - }; - DD84C6E70C856B36000EBEC4 /* Development */ = { + DD6341050973C81800B1057F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_VERSION = com.apple.compilers.llvmgcc42; + MACOSX_DEPLOYMENT_TARGET = 10.4; + OTHER_CFLAGS = ( + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", + "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + ); + OTHER_LDFLAGS = ( + "-lboinc_api", + "-lboinc", + ); + SDKROOT = ""; + STRIP_INSTALLED_PRODUCT = NO; + }; + 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 = "../../**"; + 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_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_VERSION = com.apple.compilers.llvmgcc42; + MACOSX_DEPLOYMENT_TARGET = 10.4; + OTHER_CFLAGS = ( + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", + "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + ); + OTHER_LDFLAGS = ( + "-lboinc_api", + "-lboinc", + ); + SDKROOT = ""; + STRIP_INSTALLED_PRODUCT = YES; + }; + name = Release; + }; + DD84C6E70C856B36000EBEC4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -756,23 +955,26 @@ HEADER_SEARCH_PATHS = "../../**"; 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", ); PREBINDING = NO; - PRODUCT_NAME = uc2_graphics; + PRODUCT_NAME = "uc2_graphics_i686-apple-darwin"; ZERO_LINK = NO; }; - name = Development; + name = Debug; }; - DD84C6E80C856B36000EBEC4 /* ppc_Deployment */ = { + DD84C6E90C856B36000EBEC4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_MODEL_TUNING = G5; GCC_SYMBOLS_PRIVATE_EXTERN = YES; @@ -781,43 +983,23 @@ HEADER_SEARCH_PATHS = "../../**"; 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", ); PREBINDING = NO; - PRODUCT_NAME = uc2_graphics; + PRODUCT_NAME = "uc2_graphics_i686-apple-darwin"; ZERO_LINK = NO; }; - name = ppc_Deployment; + name = Release; }; - DD84C6E90C856B36000EBEC4 /* i386_Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = 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 = "../../**"; - INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; - OTHER_LDFLAGS = ( - "-lboinc_api", - "-lboinc_graphics2", - "-lboinc", - ); - PREBINDING = NO; - PRODUCT_NAME = uc2_graphics; - ZERO_LINK = NO; - }; - name = i386_Deployment; - }; - DD84C7290C856DBB000EBEC4 /* Development */ = { + DD84C7290C856DBB000EBEC4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; @@ -826,68 +1008,173 @@ GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = Build_All; }; - name = Development; + name = Debug; }; - DD84C72A0C856DBB000EBEC4 /* ppc_Deployment */ = { + DD84C72B0C856DBB000EBEC4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Build_All; }; - name = ppc_Deployment; + name = Release; }; - DD84C72B0C856DBB000EBEC4 /* i386_Deployment */ = { + DDC4797215AC56CA0022401F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - PRODUCT_NAME = Build_All; + ARCHS = "$(ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1 = x86_64; + 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 = "../../**"; + LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; + PREBINDING = NO; + PRODUCT_NAME = "UC2_x86_64-apple-darwin"; + ZERO_LINK = NO; }; - name = i386_Deployment; + name = Debug; + }; + DDC4797315AC56CA0022401F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1 = x86_64; + 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 = "../../**"; + LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; + PREBINDING = NO; + PRODUCT_NAME = "UC2_x86_64-apple-darwin"; + ZERO_LINK = NO; + }; + name = Release; + }; + DDC479B815AC56EB0022401F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1 = x86_64; + 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 = "../../**"; + 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", + ); + PREBINDING = NO; + PRODUCT_NAME = "UC2_graphics_x86_64-apple-darwin"; + ZERO_LINK = NO; + }; + name = Debug; + }; + DDC479B915AC56EB0022401F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1 = x86_64; + 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 = "../../**"; + 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", + ); + PREBINDING = NO; + PRODUCT_NAME = "UC2_graphics_x86_64-apple-darwin"; + ZERO_LINK = NO; + }; + name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DD6341000973C81800B1057F /* Build configuration list for PBXNativeTarget "UC2" */ = { + DD6341000973C81800B1057F /* Build configuration list for PBXNativeTarget "UC2-i386" */ = { isa = XCConfigurationList; buildConfigurations = ( - DD6341010973C81800B1057F /* Development */, - DD6341020973C81800B1057F /* ppc_Deployment */, - DD63410B0973C84A00B1057F /* i386_Deployment */, - DD0E8F1A0CFD704700973F10 /* x86_64_Deployment */, + DD6341010973C81800B1057F /* Debug */, + DD63410B0973C84A00B1057F /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; DD6341040973C81800B1057F /* Build configuration list for PBXProject "UpperCase2" */ = { isa = XCConfigurationList; buildConfigurations = ( - DD6341050973C81800B1057F /* Development */, - DD6341060973C81800B1057F /* ppc_Deployment */, - DD63410C0973C84A00B1057F /* i386_Deployment */, - DD0E8F180CFD704700973F10 /* x86_64_Deployment */, + DD6341050973C81800B1057F /* Debug */, + DD63410C0973C84A00B1057F /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; - DD84C6E60C856B36000EBEC4 /* Build configuration list for PBXNativeTarget "UC2Gfx" */ = { + DD84C6E60C856B36000EBEC4 /* Build configuration list for PBXNativeTarget "UC2Gfx-i386" */ = { isa = XCConfigurationList; buildConfigurations = ( - DD84C6E70C856B36000EBEC4 /* Development */, - DD84C6E80C856B36000EBEC4 /* ppc_Deployment */, - DD84C6E90C856B36000EBEC4 /* i386_Deployment */, - DD0E8F1B0CFD704700973F10 /* x86_64_Deployment */, + DD84C6E70C856B36000EBEC4 /* Debug */, + DD84C6E90C856B36000EBEC4 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; DD84C7280C856DBB000EBEC4 /* Build configuration list for PBXAggregateTarget "Build_All" */ = { isa = XCConfigurationList; buildConfigurations = ( - DD84C7290C856DBB000EBEC4 /* Development */, - DD84C72A0C856DBB000EBEC4 /* ppc_Deployment */, - DD84C72B0C856DBB000EBEC4 /* i386_Deployment */, - DD0E8F190CFD704700973F10 /* x86_64_Deployment */, + DD84C7290C856DBB000EBEC4 /* Debug */, + DD84C72B0C856DBB000EBEC4 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; + }; + DDC4797115AC56CA0022401F /* Build configuration list for PBXNativeTarget "UC2-x86_64" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DDC4797215AC56CA0022401F /* Debug */, + DDC4797315AC56CA0022401F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + DDC479B715AC56EB0022401F /* Build configuration list for PBXNativeTarget "UC2Gfx-x86_64" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DDC479B815AC56EB0022401F /* Debug */, + DDC479B915AC56EB0022401F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; diff --git a/samples/vboxwrapper/BuildMacVboxWrapper.sh b/samples/vboxwrapper/BuildMacVboxWrapper.sh new file mode 100644 index 0000000000..59015976e7 --- /dev/null +++ b/samples/vboxwrapper/BuildMacVboxWrapper.sh @@ -0,0 +1,130 @@ +#!/bin/sh + +# This file is part of BOINC. +# http://boinc.berkeley.edu +# Copyright (C) 2008 University of California +# +# BOINC is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License +# as published by the Free Software Foundation, +# either version 3 of the License, or (at your option) any later version. +# +# BOINC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with BOINC. If not, see . +# +# +# Script to build Macintosh vboxwrapper using Makefile +# +# by Charlie Fenton 2/15/10 +# Updated 11/16/11 for XCode 4.1 and OS 10.7 +# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address +# +## This script requires OS 10.6 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 +## complete the Xcode installation before running this script. +# +## First, build the BOINC libraries using boinc/mac_build/BuildMacBOINC.sh +## +## In Terminal, CD to the wrqpper directory. +## cd [path]/vboxwrapper/ +## then run this script: +## sh [path]/BuildMacVboxWrapper.sh +## + +GCCPATH=`xcrun -find gcc` +if [ $? -ne 0 ]; then + echo "ERROR: can't find gcc compiler" + return 1 +fi + +GPPPATH=`xcrun -find g++` +if [ $? -ne 0 ]; then + echo "ERROR: can't find g++ compiler" + return 1 +fi + +MAKEPATH=`xcrun -find make` +if [ $? -ne 0 ]; then + echo "ERROR: can't find make tool" + return 1 +fi + +TOOLSPATH1=${MAKEPATH%/make} + +ARPATH=`xcrun -find ar` +if [ $? -ne 0 ]; then + echo "ERROR: can't find ar tool" + return 1 +fi + +TOOLSPATH2=${ARPATH%/ar} + +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 vboxwrapper i386/ + +echo +echo "***************************************************" +echo "******* Building 64-bit Intel Application *********" +echo "***************************************************" +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 SDKROOT="${SDKPATH}" +export MACOSX_DEPLOYMENT_TARGET=10.5 + + +make -f Makefile_mac clean +make -f Makefile_mac all + + if [ $? -ne 0 ]; then exit 1; fi + +mkdir x86_64 +mv vboxwrapper x86_64/ + +rm -f vboxwrapper.o + +echo +echo "***************************************************" +echo "**************** Build Succeeded! *****************" +echo "***************************************************" +echo + +export CC="";export CXX="" +export LDFLAGS="" +export CPPFLAGS="" +export CFLAGS="" + +exit 0 + diff --git a/samples/vboxwrapper/Makefile_mac b/samples/vboxwrapper/Makefile_mac new file mode 100644 index 0000000000..313ad92e76 --- /dev/null +++ b/samples/vboxwrapper/Makefile_mac @@ -0,0 +1,43 @@ +# makefile for BOINC vboxwrapper application on Macintosh. +# This is invoked from BuildMacVboxWrapper.sh shell script. +# It should not be used by itself without the script. +# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address + + +BOINC_DIR = ../.. +BOINC_API_DIR = $(BOINC_DIR)/api +BOINC_LIB_DIR = $(BOINC_DIR)/lib +BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment +BOINC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac +FRAMEWORKS_DIR = /System/Library/Frameworks + +CXXFLAGS = $(VARIANTFLAGS) \ + -g \ + -DAPP_GRAPHICS \ + -I$(BOINC_CONFIG_DIR) \ + -I$(BOINC_DIR) \ + -I$(BOINC_LIB_DIR) \ + -I$(BOINC_API_DIR) \ + -L$(BOINC_BUILD_DIR) \ + -L. + +OBJ = \ + floppyio.o \ + vbox.o \ + vboxwrapper.o + +PROGS = vboxwrapper + +all: $(PROGS) + +clean: + /bin/rm -f $(PROGS) $(OBJ) + +floppyio.o: floppyio.cpp + $(CXX) $(CXXFLAGS) -c floppyio.cpp + +vbox.o: vbox.cpp + $(CXX) $(CXXFLAGS) -c vbox.cpp + +vboxwrapper: vboxwrapper.o vbox.o floppyio.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_api.a + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o vboxwrapper vboxwrapper.o vbox.o floppyio.o -pthread -lboinc_api -lboinc diff --git a/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj b/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj index c6ae5b711f..a7cf929d24 100644 --- a/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj +++ b/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj @@ -6,6 +6,21 @@ objectVersion = 45; objects = { +/* Begin PBXAggregateTarget section */ + DDF95AF415AD8A54004AD167 /* Build_All */ = { + isa = PBXAggregateTarget; + buildConfigurationList = DDF95AF715AD8A54004AD167 /* Build configuration list for PBXAggregateTarget "Build_All" */; + buildPhases = ( + ); + dependencies = ( + DDF95AFA15AD8A65004AD167 /* PBXTargetDependency */, + DDF95AFC15AD8A65004AD167 /* PBXTargetDependency */, + ); + name = Build_All; + productName = Build_All; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ DD3B677B140CF9470088683F /* vbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD90CE9E140CAB3D0074CF46 /* vbox.cpp */; }; DD3B677C140CF9470088683F /* vboxwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD90CEA0140CAB3D0074CF46 /* vboxwrapper.cpp */; }; @@ -15,6 +30,23 @@ DD90CEA2140CAB3D0074CF46 /* vboxwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD90CEA0140CAB3D0074CF46 /* vboxwrapper.cpp */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + DDF95AF915AD8A65004AD167 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8DD76FA90486AB0100D96B5E; + remoteInfo = vboxwrapper_i686; + }; + DDF95AFB15AD8A65004AD167 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = DD3B6779140CF9470088683F; + remoteInfo = vboxwrapper_x86_64; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 8DD76FB20486AB0100D96B5E /* vboxwrapper_i686 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vboxwrapper_i686; sourceTree = BUILT_PRODUCTS_DIR; }; DD3B6783140CF9470088683F /* vboxwrapper_x86_64 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vboxwrapper_x86_64; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -131,6 +163,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( + DDF95AF415AD8A54004AD167 /* Build_All */, 8DD76FA90486AB0100D96B5E /* vboxwrapper_i686 */, DD3B6779140CF9470088683F /* vboxwrapper_x86_64 */, ); @@ -149,7 +182,7 @@ ); 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 cp -fpR \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.dSYM\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n fi\nfi\n"; + 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"; }; DDB3501A1421FBF000EF2DFC /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -162,7 +195,7 @@ ); 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 cp -fpR \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.dSYM\" \"${SRCROOT}/build/${CONFIGURATION}/${PRODUCT_NAME}.dSYM\"\n fi\nfi\n"; + 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"; }; /* End PBXShellScriptBuildPhase section */ @@ -189,12 +222,24 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + DDF95AFA15AD8A65004AD167 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8DD76FA90486AB0100D96B5E /* vboxwrapper_i686 */; + targetProxy = DDF95AF915AD8A65004AD167 /* PBXContainerItemProxy */; + }; + DDF95AFC15AD8A65004AD167 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DD3B6779140CF9470088683F /* vboxwrapper_x86_64 */; + targetProxy = DDF95AFB15AD8A65004AD167 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB928608733DD80010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = vboxwrapper_i686; - SDKROOT = macosx10.6; USER_HEADER_SEARCH_PATHS = ../../clientgui/mac; }; name = Debug; @@ -203,7 +248,6 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = vboxwrapper_i686; - SDKROOT = macosx10.6; USER_HEADER_SEARCH_PATHS = ../../clientgui/mac; }; name = Release; @@ -228,13 +272,18 @@ ../.., ); LIBRARY_SEARCH_PATHS = "../../mac_build/build/Development/**"; + MACOSX_DEPLOYMENT_TARGET = 10.4; + OTHER_CFLAGS = ( + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", + "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + ); OTHER_LDFLAGS = ( "-lboinc_api", "-lboinc", ); PREBINDING = NO; PRODUCT_NAME = vboxwrapper; - SDKROOT = macosx10.5; + SDKROOT = ""; STRIP_INSTALLED_PRODUCT = NO; }; name = Debug; @@ -259,6 +308,11 @@ ../.., ); LIBRARY_SEARCH_PATHS = "../../mac_build/build/Deployment/**"; + MACOSX_DEPLOYMENT_TARGET = 10.4; + OTHER_CFLAGS = ( + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", + "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", + ); OTHER_LDFLAGS = ( "-lboinc_api", "-lboinc", @@ -266,7 +320,7 @@ PREBINDING = NO; PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_NAME = vboxwrapper; - SDKROOT = macosx10.5; + SDKROOT = ""; STRIP_INSTALLED_PRODUCT = YES; }; name = Release; @@ -299,6 +353,20 @@ }; name = Release; }; + DDF95AF515AD8A54004AD167 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + DDF95AF615AD8A54004AD167 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -329,6 +397,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + DDF95AF715AD8A54004AD167 /* Build configuration list for PBXAggregateTarget "Build_All" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DDF95AF515AD8A54004AD167 /* Debug */, + DDF95AF615AD8A54004AD167 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; diff --git a/samples/wrapper/BuildMacWrapper.sh b/samples/wrapper/BuildMacWrapper.sh index 0b07888bec..44bde6dbf6 100644 --- a/samples/wrapper/BuildMacWrapper.sh +++ b/samples/wrapper/BuildMacWrapper.sh @@ -22,6 +22,13 @@ # # by Charlie Fenton 2/15/10 # Updated 11/16/11 for XCode 4.1 and OS 10.7 +# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address +# +## This script requires OS 10.6 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 +## complete the Xcode installation before running this script. # ## First, build the BOINC libraries using boinc/mac_build/BuildMacBOINC.sh ## @@ -31,42 +38,51 @@ ## sh [path]/BuildMacWrapper.sh ## -rm -fR ppc i386 x86_64 - -if [ -d /Developer/SDKs/MacOSX10.3.sdk/ ]; then - - echo - echo "***************************************************" - echo "********** Building PowerPC Application ***********" - echo "***************************************************" - echo - - export MACOSX_DEPLOYMENT_TARGET=10.3 - export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 - export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk,-arch,ppc" - export VARIANTFLAGS="-arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -fvisibility=hidden -fvisibility-inlines-hidden" - - rm -f wrapper.o - rm -f wrapper - make -f Makefile_mac all - - if [ $? -ne 0 ]; then exit 1; fi - - mkdir ppc - mv wrapper ppc/ - +GCCPATH=`xcrun -find gcc` +if [ $? -ne 0 ]; then + echo "ERROR: can't find gcc compiler" + return 1 fi +GPPPATH=`xcrun -find g++` +if [ $? -ne 0 ]; then + echo "ERROR: can't find g++ compiler" + return 1 +fi + +MAKEPATH=`xcrun -find make` +if [ $? -ne 0 ]; then + echo "ERROR: can't find make tool" + return 1 +fi + +TOOLSPATH1=${MAKEPATH%/make} + +ARPATH=`xcrun -find ar` +if [ $? -ne 0 ]; then + echo "ERROR: can't find ar tool" + return 1 +fi + +TOOLSPATH2=${ARPATH%/ar} + +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 MACOSX_DEPLOYMENT_TARGET=10.6 -export CC=/usr/bin/gcc-4.2;export CXX=/usr/bin/g++-4.2 -export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk,-arch,i386" -export VARIANTFLAGS="-arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -isysroot /Developer/SDKs/MacOSX10.6.sdk -fvisibility=hidden -fvisibility-inlines-hidden" +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 rm -f wrapper.o rm -f wrapper @@ -83,11 +99,12 @@ echo "******* Building 64-bit Intel Application *********" echo "***************************************************" echo -export MACOSX_DEPLOYMENT_TARGET=10.6 -export CC=/usr/bin/gcc-4.2;export CXX=/usr/bin/g++-4.2 -export LDFLAGS="-Wl,-arch x86_64" -export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk,-arch,x86_64" -export VARIANTFLAGS="-arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1050 -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 -isysroot /Developer/SDKs/MacOSX10.6.sdk -fvisibility=hidden -fvisibility-inlines-hidden" +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 SDKROOT="${SDKPATH}" +export MACOSX_DEPLOYMENT_TARGET=10.5 + rm -f wrapper.o rm -f wrapper