From d52ab508d535fd46d4956bc72452975bd8de30a9 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Sat, 27 Oct 2007 11:16:38 +0000 Subject: [PATCH] Mac: Fix bugs in scripts for building wxMac-2.6.3 and use gcc-4.0; fix XCode project when using debug build of wxMac-2.6.3 svn path=/trunk/boinc/; revision=13972 --- mac_build/buildWxMac.sh | 16 +++++----------- mac_build/setupForBOINC.sh | 3 +-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh index cf9a6a3557..d12b03181f 100644 --- a/mac_build/buildWxMac.sh +++ b/mac_build/buildWxMac.sh @@ -22,13 +22,7 @@ # # Script to build the wxMac-2.6.3 library for BOINC as a Universal Binary # -# by Charlie Fenton 7/21/06 -# -## Before running this script, you must first copy the special XCode -## project -## boinc/mac_build/wxMac-BOINC.xcodeproj -## to -## wxMac-2.6.3/src/ +# by Charlie Fenton 10/26/07 # # ## In Terminal, CD to the wxMac-2.6.3 directory. @@ -63,7 +57,7 @@ else rm -f src/build/Deployment/libwx_mac.a -xcodebuild -project src/wxMac-BOINC.xcodeproj -target wxStaticRelease -configuration Deployment $doclean build GCC_VERSION_ppc=3.3 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk ARCHS="ppc" EXECUTABLE_NAME="libwx_mac_ppc.a" +xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk ARCHS="ppc" EXECUTABLE_NAME="libwx_mac_ppc.a" if [ $? -ne 0 ]; then return 1; fi fi @@ -75,7 +69,7 @@ else rm -f src/build/Deployment/libwx_mac.a -xcodebuild -project src/wxMac-BOINC.xcodeproj -target wxStaticRelease -configuration Deployment $doclean build GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386" EXECUTABLE_NAME="libwx_mac_i386.a" +xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386" EXECUTABLE_NAME="libwx_mac_i386.a" if [ $? -ne 0 ]; then return 1; fi fi @@ -96,7 +90,7 @@ else rm -f src/build/Deployment/libwx_macd.a -xcodebuild -project src/wxMac-BOINC.xcodeproj -target wxStaticDebug -configuration Deployment $doclean build GCC_VERSION_ppc=3.3 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk ARCHS="ppc" EXECUTABLE_NAME="libwx_macd_ppc.a" +xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk ARCHS="ppc" EXECUTABLE_NAME="libwx_macd_ppc.a" if [ $? -ne 0 ]; then return 1; fi fi @@ -107,7 +101,7 @@ else rm -f src/build/Deployment/libwx_macd.a -xcodebuild -project src/wxMac-BOINC.xcodeproj -target wxStaticDebug -configuration Deployment $doclean build GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386" EXECUTABLE_NAME="libwx_macd_i386.a" +xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386" EXECUTABLE_NAME="libwx_macd_i386.a" if [ $? -ne 0 ]; then return 1; fi fi diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh index 733e12a404..de55cafdde 100644 --- a/mac_build/setupForBOINC.sh +++ b/mac_build/setupForBOINC.sh @@ -25,6 +25,7 @@ # # by Charlie Fenton 7/21/06 # Updated for curl-7.17.0 10/21/07 +# Bug fix for wxMac-2.6.3 7/26/07 # # Download these three packages and place them in a common parent # directory with the BOINC source tree. @@ -81,8 +82,6 @@ echo "" cd "${SCRIPT_DIR}" -cp -fpR wxMac-BOINC.xcodeproj ../../wxMac-2.6.3/src/ - cd ../../wxMac-2.6.3/ if [ $? -ne 0 ]; then return 1; fi source "${SCRIPT_DIR}/buildWxMac.sh" ${doclean}