diff --git a/checkin_notes b/checkin_notes index aa6da58501..2e282d5d7c 100755 --- a/checkin_notes +++ b/checkin_notes @@ -4482,3 +4482,9 @@ Rom 4 May 2006 client/win/ win_service.cpp +Charlie 5 May 2006 + - Mac: Clean up build scripts for jpeg and curl. + + mac_build/ + buildcurl.sh + buildjpeg.sh diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index a5d05666aa..e1c8182bea 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -23,7 +23,7 @@ # Script to build Macintosh Universal Binary library of curl-7.15.3 for # use in building BOINC. # -# by Charlie Fenton 4/27/06 +# by Charlie Fenton 5/5/06 # ## In Terminal, CD to the curl-7.15.3 directory. ## cd [path]/curl-7.15.3/ @@ -44,8 +44,10 @@ fi export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 export LDFLAGS="-arch ppc" -export CPPFLAGS="-arch ppc" export CFLAGS="-arch ppc" +export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk" + +## ./configure --enable-shared=NO --host=ppc --build=ppc ./configure --enable-shared=NO --host=ppc --build=ppc CPPFLAGS="-arch ppc -I/Developer/SDKs/MacOSX10.3.9.sdk/Developer/Headers/FlatCarbon -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3 -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3/c++ -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3/c++/ppc-darwin -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include" if [ $? -ne 0 ]; then exit 1; fi @@ -69,6 +71,8 @@ export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 export LDFLAGS="" export CPPFLAGS="" export CFLAGS="" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" + ./configure --enable-shared=NO --host=i386 --build=i386 if [ $? -ne 0 ]; then exit 1; fi @@ -85,5 +89,7 @@ if [ $? -ne 0 ]; then exit 1; fi export CC="";export CXX="" export LDFLAGS="" export CPPFLAGS="" +export CFLAGS="" +export SDKROOT="" return 0 diff --git a/mac_build/buildjpeg.sh b/mac_build/buildjpeg.sh index 89dcaab16b..a2080e9659 100644 --- a/mac_build/buildjpeg.sh +++ b/mac_build/buildjpeg.sh @@ -40,26 +40,21 @@ if [ "$1" != "-clean" ]; then fi fi - -## cd [path]/jpeg-6b/ export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 export LDFLAGS="-arch ppc" export CPPFLAGS="-arch ppc" -export CFLAGS="-arch ppc" +export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk" ./configure --disable-shared --host=ppc if [ $? -ne 0 ]; then exit 1; fi -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk" -export CPPFLAGS="-I/Developer/SDKs/MacOSX10.3.9.sdk/Developer/Headers/FlatCarbon -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3 -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3/c++ -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3/c++/ppc-darwin -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include" - rm -f libjpeg_ppc.a rm -f libjpeg_i386.a rm -f libjpeg.a make clean -make +make -e if [ $? -ne 0 ]; then exit 1; fi mv -f libjpeg.a libjpeg_ppc.a @@ -70,7 +65,8 @@ export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 export LDFLAGS="" export CPPFLAGS="" -export CFLAGS="" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" + ./configure --disable-shared --host=i386 if [ $? -ne 0 ]; then exit 1; fi @@ -87,5 +83,6 @@ if [ $? -ne 0 ]; then exit 1; fi export CC="";export CXX="" export LDFLAGS="" export CPPFLAGS="" +export SDKROOT="" return 0