diff --git a/checkin_notes b/checkin_notes index 235d9db781..c800cd838d 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7234,6 +7234,26 @@ David 8 Oct 2010 Charlie 8 Oct 2010 - Mac: Update build example. + samples/ mac_build/ UpperCase2.xcodeproj + +Charlie 11 Oct 2010 + - Mac: Update build scripts, build examples and documentation. + + mac_build/ + buildc-ares.sh + buildcurl.sh + buildjpeg.sh + BuildMacBOINC.sh + buildWxMac.sh + HowToBuildBOINC_XCode.rtf + samples/ + example_app/ + Makefile_mac2 + MakeMacExample.sh + mac_build/ + UpperCase2.xcodeproj + wrapper/ + BuildMacWrapper.sh diff --git a/mac_build/BuildMacBOINC.sh b/mac_build/BuildMacBOINC.sh index aaa31f57b3..d19937af47 100644 --- a/mac_build/BuildMacBOINC.sh +++ b/mac_build/BuildMacBOINC.sh @@ -24,6 +24,7 @@ # with thanks to Reinhard Prix for his assistance # # Updated for OS 10.6 and XCode 3.2 on 2/11/10 +# Updated 10/11/10 ## ## Usage: @@ -123,6 +124,16 @@ if [ ! -d /Developer/SDKs/MacOSX10.5.sdk/ ]; then return 1 fi +if [ "${buildall}" = "1" ] || [ "${targets}" = "" ]; then + if [ "${style}" = "Deployment" ]; then + if [ ! -d /Developer/SDKs/MacOSX10.6.sdk/ ]; then + echo "ERROR: System 10.6 SDK is missing. For details, see build instructions at" + echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild" + return 1 + fi + fi +fi + if [ "${style}" = "Development" ]; then echo "Development (debug) build" else @@ -130,12 +141,6 @@ else echo "Deployment (release) build for architectures: i386, ppc, x86_64" fi -if [ ! -d /Developer/SDKs/MacOSX10.6.sdk/ ]; then - echo "ERROR: System 10.6 SDK is missing. For details, see build instructions at" - echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild" - return 1 -fi - echo "" export DEVELOPER_SDK_DIR="/Developer/SDKs" diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf index 126870c2d6..2bc80cd1db 100644 --- a/mac_build/HowToBuildBOINC_XCode.rtf +++ b/mac_build/HowToBuildBOINC_XCode.rtf @@ -13,7 +13,7 @@ \b0\fs24 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc \cf0 Written by Charlie Fenton\ -Last updated 10/8/10\ +Last updated 10/11/10\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \cf0 \ This document applies to BOINC version 6.11.9 and later. It has instructions for building the BOINC Client and Manager for Macintosh OSX. Information for building science project applications to run under BOINC on Macintosh OSX can be found {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BuildMacApp"}}{\fldrslt here}}. \ @@ -282,6 +282,12 @@ The options for BuildMacBOINC.sh are:\ The standard release of BOINC version 6.10.58 and later contains a universal binary of the BOINC Client containing builds for two architectures: ppc and i386. The Mac OS automatically chooses the appropriate architecture as follows:\ \'95 On a PowerPC Mac, it runs the ppc executable.\ * On an Intel Mac, it runs the i386 executable.\ +\ +Note: you may see the following warning when building the PowerPC executable. You may safely ignore it:\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural + +\f1\fs26 \cf0 ld: warning: object file compiled with -mlong-branch which is no longer needed. To remove this warning, recompile without -mlong-branch +\f0\fs24 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f3 \cf0 \ diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh index 44518aab88..4cb8f6dbd7 100644 --- a/mac_build/buildWxMac.sh +++ b/mac_build/buildWxMac.sh @@ -22,6 +22,7 @@ # # by Charlie Fenton 7/21/06 # Updated for wx-Mac 2.8.10 and Unicode 4/17/09 +# Updated 10/11/10 # ## In Terminal, CD to the wxMac-2.8.10 directory. @@ -88,7 +89,8 @@ if [ "$1" != "-clean" ] && [ -f src/build/Deployment/libwx_mac_static.a ]; then echo "Deployment libwx_mac_static.a already built" else export DEVELOPER_SDK_DIR="/Developer/SDKs" - xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION=4.0 GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET=10.4 SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386 ppc" OTHER_CFLAGS="-I build/include -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030 -fvisibility=hidden -fvisibility-inlines-hidden" + ## We must override some of the build settings in wxWindows.xcodeproj + xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 ARCHS="i386 ppc" OTHER_CPLUSPLUSFLAGS="-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -fvisibility=hidden -fvisibility-inlines-hidden" if [ $? -ne 0 ]; then return 1; fi fi @@ -97,10 +99,8 @@ if [ "$1" != "-clean" ] && [ -f src/build/Development/libwx_mac_static.a ]; then echo "Development libwx_mac_static.a already built" else export DEVELOPER_SDK_DIR="/Developer/SDKs" - xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build GCC_VERSION=4.0 GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET=10.4 SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk OTHER_CFLAGS="-I build/include -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030 -fvisibility=hidden -fvisibility-inlines-hidden" -## The above line does Development build for only the native architecture. -## Use line below instead for Universal Binary Development build -## xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build MACOSX_DEPLOYMENT_TARGET=10.4 SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386 ppc" OTHER_CFLAGS="-I build/include -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030 -fvisibility=hidden -fvisibility-inlines-hidden" + ## We must override some of the build settings in wxWindows.xcodeproj + xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk OTHER_CPLUSPLUSFLAGS="-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DwxUSE_UNICODE=1 -fvisibility=hidden -fvisibility-inlines-hidden" if [ $? -ne 0 ]; then return 1; fi fi diff --git a/mac_build/buildc-ares.sh b/mac_build/buildc-ares.sh index a4bad23c63..1bec278894 100644 --- a/mac_build/buildc-ares.sh +++ b/mac_build/buildc-ares.sh @@ -27,7 +27,7 @@ # # by Charlie Fenton 7/21/06 # Updated 12/3/09 for OS 10.6 Snow Leopard and XCode 3.2.1 -# Updated 4/3/10 +# Updated 10/11/10 # ## In Terminal, CD to the c-ares-1.6.0 directory. ## cd [path]/c-ares-1.6.0/ @@ -44,8 +44,8 @@ if [ "$1" != "-clean" ]; then fi fi -if [ ! -d /Developer/SDKs/MacOSX10.6.sdk/ ]; then - echo "ERROR: System 10.6 SDK is missing. For details, see build instructions at" +if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk/ ]; then + echo "ERROR: System 10.4u SDK is missing. For details, see build instructions at" echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild" return 1 fi @@ -57,10 +57,10 @@ rm -f .libs/libcares_ppc.a rm -f .libs/libcares_i386.a export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch ppc" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch ppc" -export SDKROOT="/Developer/SDKs/MacOSX10.6.sdk" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.3 ./configure --enable-shared=NO prefix=/tmp/installed-c-ares --host=ppc @@ -78,12 +78,12 @@ mv -f .libs/libcares.a libcares_ppc.a make clean if [ $? -ne 0 ]; then return 1; fi -##export PATH=/usr/local/bin:$PATH +export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386" -export SDKROOT="/Developer/SDKs/MacOSX10.6.sdk" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.4 ./configure --enable-shared=NO prefix=/tmp/installed-c-ares --host=i386 diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index a861bdfa20..9d81d6b1f6 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -27,7 +27,7 @@ # # by Charlie Fenton 7/21/06 # Updated 12/3/09 for OS 10.6 Snow Leopard and XCode 3.2.1 -# Updated 4/3/10 +# Updated 10/11/10 # ## In Terminal, CD to the curl-7.19.7 directory. ## cd [path]/curl-7.19.7/ @@ -44,8 +44,8 @@ if [ "$1" != "-clean" ]; then fi fi -if [ ! -d /Developer/SDKs/MacOSX10.6.sdk/ ]; then - echo "ERROR: System 10.6 SDK is missing. For details, see build instructions at" +if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk/ ]; then + echo "ERROR: System 10.4u SDK is missing. For details, see build instructions at" echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild" return 1 fi @@ -258,10 +258,10 @@ rm -f include/curl/curlbuild_ppc.h rm -f include/curl/curlbuild_i386.h export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS=" -isysroot /Developer/SDKs/MacOSX10.6.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk -arch ppc" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export SDKROOT="/Developer/SDKs/MacOSX10.6.sdk" +export LDFLAGS=" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.3 # c-ares configure creates a different ares_build.h file for each architecture @@ -280,12 +280,12 @@ mv -f lib/.libs/libcurl.a lib/libcurl_ppc.a make clean if [ $? -ne 0 ]; then return 1; fi -##export PATH=/usr/local/bin:$PATH +export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk -arch i386" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export SDKROOT="/Developer/SDKs/MacOSX10.6.sdk" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.4 # c-ares configure creates a different ares_build.h file for each architecture diff --git a/mac_build/buildjpeg.sh b/mac_build/buildjpeg.sh index 6cde8a4b34..946912fdcd 100644 --- a/mac_build/buildjpeg.sh +++ b/mac_build/buildjpeg.sh @@ -22,8 +22,8 @@ # use in building BOINC. # # by Charlie Fenton 12/19/07 -# Updated 2/27/08 # Updated 12/3/09 for OS 10.6 Snow Leopard and XCode 3.2.1 +# Updated 10/11/10 # ## In Terminal, CD to the jpeg-6b directory. ## cd [path]/jpeg-6b/ @@ -40,18 +40,24 @@ if [ "$1" != "-clean" ]; then fi fi -if [ ! -d /Developer/SDKs/MacOSX10.6.sdk/ ]; then - echo "ERROR: System 10.6 SDK is missing. For details, see build instructions at" +if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk/ ]; then + echo "ERROR: System 10.4u SDK is missing. For details, see build instructions at" + echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild" + return 1 +fi + +if [ ! -d /Developer/SDKs/MacOSX10.5.sdk/ ]; then + echo "ERROR: System 10.5 SDK is missing. For details, see build instructions at" echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild" return 1 fi export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.6.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk" -export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.6.sdk -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.6.sdk -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export SDKROOT="/Developer/SDKs/MacOSX10.6.sdk" +export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" +export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.4u.sdk -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.4u.sdk -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.3 ./configure --disable-shared --host=ppc @@ -70,12 +76,12 @@ mv -f libjpeg.a libjpeg_ppc.a make clean if [ $? -ne 0 ]; then return 1; fi -##export PATH=/usr/local/bin:$PATH +export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk -arch i386" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export SDKROOT="/Developer/SDKs/MacOSX10.6.sdk" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.4 ./configure --disable-shared --host=i386 @@ -90,12 +96,12 @@ mv libjpeg.a libjpeg_i386.a make clean if [ $? -ne 0 ]; then return 1; fi -##export PATH=/usr/local/bin:$PATH +export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch x86_64" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" -export SDKROOT="/Developer/SDKs/MacOSX10.6.sdk" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DMAC_OS_X_VERSION_MIN_REQUIRED=1030" +export SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" export MACOSX_DEPLOYMENT_TARGET=10.5 ./configure --disable-shared --host=x86_64 diff --git a/samples/example_app/MakeMacExample.sh b/samples/example_app/MakeMacExample.sh index 128b6be603..9741a11e0d 100644 --- a/samples/example_app/MakeMacExample.sh +++ b/samples/example_app/MakeMacExample.sh @@ -21,7 +21,7 @@ # Script to build Macintosh example_app using Makefile # # by Charlie Fenton 2/16/10 -# Updated 10/8/10 for XCode 3.2 and OS 10.6 +# Updated 10/11/10 for XCode 3.2 and OS 10.6 # ## First, build the BOINC libraries using boinc/mac_build/BuildMacBOINC.sh ## @@ -40,9 +40,9 @@ echo "***************************************************" echo export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export MACOSX_DEPLOYMENT_TARGET=10.4 -export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.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.6.sdk -fvisibility=hidden -fvisibility-inlines-hidden" +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" rm -f uc2.o @@ -65,8 +65,8 @@ echo 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.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 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 @@ -89,7 +89,7 @@ echo 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.6.sdk -fvisibility=hidden -fvisibility-inlines-hidden" +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_mac2 b/samples/example_app/Makefile_mac2 index 9dddb51003..27644c5fe5 100644 --- a/samples/example_app/Makefile_mac2 +++ b/samples/example_app/Makefile_mac2 @@ -22,24 +22,24 @@ CXXFLAGS_ALL = \ 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.6.sdk \ + -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_PPC = -Wl,-syslibroot,/Developer/SDKs/MacOSX106.sdk,-arch,ppc +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.6.sdk \ + -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_i386 = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk,-arch,i386 +LDFLAGS_i386 = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk,-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.6.sdk \ + -isysroot /Developer/SDKs/MacOSX10.5.sdk \ $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_x86_64 = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk,-arch,x86_64 +LDFLAGS_x86_64 = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk,-arch,x86_64 LIBJPEG = ../../../jpeg-6b/libjpeg.a @@ -59,18 +59,27 @@ 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 uc2_graphics_i386.o: uc2_graphics.cpp $(CXX_i386) -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 diff --git a/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj b/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj index 4eedbe393d..b162c841ca 100644 --- a/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj +++ b/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj @@ -690,7 +690,7 @@ buildSettings = { ARCHS = ppc; GCC_VERSION = 4.0; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ( "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", diff --git a/samples/wrapper/BuildMacWrapper.sh b/samples/wrapper/BuildMacWrapper.sh index 9a83fb2da8..65336cdc90 100644 --- a/samples/wrapper/BuildMacWrapper.sh +++ b/samples/wrapper/BuildMacWrapper.sh @@ -21,7 +21,7 @@ # Script to build Macintosh wrapper using Makefile # # by Charlie Fenton 2/15/10 -# Updated 10/8/10 for XCode 3.2 and OS 10.6 +# Updated 10/11/10 for XCode 3.2 and OS 10.6 # ## First, build the BOINC libraries using boinc/mac_build/BuildMacBOINC.sh ## @@ -39,10 +39,10 @@ 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 MACOSX_DEPLOYMENT_TARGET=10.4 -export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.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.6.sdk -fvisibility=hidden -fvisibility-inlines-hidden" +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 @@ -61,8 +61,8 @@ echo 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.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 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 wrapper.o rm -f wrapper @@ -83,7 +83,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.5 export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 export LDFLAGS="-Wl,-arch x86_64" 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.6.sdk -fvisibility=hidden -fvisibility-inlines-hidden" +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 wrapper.o rm -f wrapper