Build fat 32- and 64-bit binaries

git-svn-id: http://svn.clifford.at/openscad/trunk@533 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 26 insertions, 7 deletions

diff --git a/doc/checklist-macosx.txt b/doc/checklist-macosx.txt
index 977e105..f9cb4e6 100644
--- a/doc/checklist-macosx.txt
+++ b/doc/checklist-macosx.txt
@@ -14,20 +14,40 @@ o Build gmp
 
   tar xjz gmp-5.0.1.tar.bz2
   cd gmp-5.0.1
-  ./configure --prefix=$PWD/../../deploy CFLAGS=-mmacosx-version-min=10.5 LDFLAGS=-mmacosx-version-min=10.5
+  mkdir build-i386
+  cd build-i386
+  ../configure --prefix=$PWD/../../../deploy "CFLAGS=-mmacosx-version-min=10.5 -arch i386" LDFLAGS="-mmacosx-version-min=10.5 -arch i386" ABI=32 --libdir=$PWD/../../../deploy/lib-i386
   make install
+  cd ..
+  mkdir build-x86_64
+  cd build-x86_64
+ ../configure --prefix=$PWD/../../../deploy "CFLAGS=-mmacosx-version-min=10.5" LDFLAGS="-mmacosx-version-min=10.5" --libdir=$PWD/../../../deploy/lib-x86_64
+  make install
+  cd ../../../deploy
+  lipo -create lib-i386/libgmp.dylib lib-x86_64/libgmp.dylib -output lib/libgmp.dylib
+  install_name_tool -id $PWD/lib/libgmp.dylib lib/libgmp.dylib
 
 o Build mpfr
   tar xjz mpfr-2.4.2.tar.bz2
   cd mpfr-2.4.2
-  ./configure --prefix=$PWD/../../deploy --with-gmp=$PWD/../../deploy CFLAGS=-mmacosx-version-min=10.5 LDFLAGS=-mmacosx-version-min=10.5
+  mkdir build-i386
+  cd build-i386
+  ../configure --prefix=$PWD/../../../deploy --with-gmp=$PWD/../../../deploy CFLAGS="-mmacosx-version-min=10.5 -arch i386" LDFLAGS="-mmacosx-version-min=10.5 -arch i386"  --libdir=$PWD/../../../deploy/lib-i386
+  make install
+  cd ..
+  mkdir build-x86_64
+  cd build-x86_64
+  ../configure --prefix=$PWD/../../../deploy --with-gmp=$PWD/../../../deploy CFLAGS="-mmacosx-version-min=10.5 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.5 -arch x86_64"  --libdir=$PWD/../../../deploy/lib-x86_64
   make install
+  cd ../../../deploy
+  lipo -create lib-i386/libmpfr.dylib lib-x86_64/libmpfr.dylib -output lib/libmpfr.dylib
+  install_name_tool -id $PWD/lib/libmpfr.dylib lib/libmpfr.dylib
 
 o Build boost::thread
   tar xjz boost_1_42_0.tar.bz2
   cd boost_1_42_0
   ./bootstrap.sh --prefix=$PWD/../../deploy --with-libraries=thread
-  ./bjam cflags="-mmacosx-version-min=10.5" linkflags="-mmacosx-version-min=10.5"
+  ./bjam cflags="-mmacosx-version-min=10.5 -arch i386 -arch x86_64" linkflags="-mmacosx-version-min=10.5 -arch i386 -arch x86_64"
   ./bjam install
   install_name_tool -id $PWD/../../deploy/lib/libboost_thread.dylib /Users/kintel/code/metalab/checkout/OpenSCAD/libraries/deploy/lib/libboost_thread.dylib 
 
@@ -35,7 +55,7 @@ o Build CGAL >= 3.5
 
   tar xzf CGAL-3.6.tar.gz
   cd CGAL-3.6
-  cmake -DCMAKE_INSTALL_PREFIX=$PWD/../../deploy -DBUILD_SHARED_LIBS=FALSE -DCMAKE_OSX_DEPLOYMENT_TARGET="10.5"
+  cmake -DCMAKE_INSTALL_PREFIX=$PWD/../../deploy -DBUILD_SHARED_LIBS=FALSE -DCMAKE_OSX_DEPLOYMENT_TARGET="10.5" -DCMAKE_OSX_ARCHITECTURES="i386;x86_64"
   make -j4
   make install
 
@@ -45,7 +65,7 @@ o Patch & build GLEW
   cd glew-1.5.3
   patch -p1 < ../openscad/patches/glew-1.5.3-MacOSX.patch
   mkdir ../../deploy/lib/pkgconfig
-  GLEW_DEST=$PWD/../../deploy make install
+  make GLEW_DEST=$PWD/../../deploy CFLAGS.EXTRA="-no-cpp-precomp -dynamic -fno-common -mmacosx-version-min=10.5 -arch i386 -arch x86_64" LDFLAGS.EXTRA="-mmacosx-version-min=10.5 -arch i386 -arch x86_64" install
 
 o Patch and build OpenCSG >= 1.3.0
 
@@ -53,8 +73,7 @@ o Patch and build OpenCSG >= 1.3.0
   tar xzf OpenCSG-1.3.0.tar.gz
   cd OpenCSG-1.3.0
   patch -p1 < ../openscad/patches/OpenCSG-1.3.0-MacOSX-port.patch
-  MACOSX_DEPLOY_DIR=$PWD/../../deploy qmake -r
-  make
+  MACOSX_DEPLOY_DIR=$PWD/../../deploy qmake -r CONFIG+="x86 x86_64"
   make install
   
 o Build and Deploy OpenSCAD