From 944d79fb440a668057682a091b908a4f6fcdce98 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 27 Feb 2006 09:13:39 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9564 --- checkin_notes | 4 +++- mac_build/buildWxMac.sh | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index affa9058c7..f452205a79 100755 --- a/checkin_notes +++ b/checkin_notes @@ -2387,7 +2387,9 @@ Charlie 25 Feb 2006 release_GridRepublic.sh Charlie 27 Feb 2006 - - Mac: Fix tilde expansion bug in build script. + - Mac: Fix tilde expansion bug in setupForBOINC build script. + - Fix bug in buildWxMac build script. mac_build/ setupForBOINC.sh + buildWxMac.sh diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh index 7df0d8e9d2..421c0a9053 100644 --- a/mac_build/buildWxMac.sh +++ b/mac_build/buildWxMac.sh @@ -22,7 +22,7 @@ # # Script to build the wxMac-2.6.2 library for BOINC as a Universal Binary # -# by Charlie Fenton 2/17/06 +# by Charlie Fenton 2/27/06 # ## Before running this script, you must first copy the special XCode ## project @@ -112,8 +112,8 @@ xcodebuild -project src/wxMac-BOINC.xcodeproj -target wxStaticDebug -configurat if [ $? -ne 0 ]; then exit 1; fi fi -if [ "$1" != "-clean" ] && [ -f src/build/Deployment/libwx_macd_ppc.a ]; then - echo "libwx_macd_ppc.a already built" +if [ "$1" != "-clean" ] && [ -f src/build/Deployment/libwx_macd.a ]; then + echo "libwx_macd.a already built" else lipo -create src/build/Deployment/libwx_macd_ppc.a src/build/Deployment/libwx_macd_i386.a -output src/build/Deployment/libwx_macd.a