Merge build script updates from 2.8 branch.

[wxWidgets.git] / distrib / scripts / mac / macbuild

diff --git a/distrib/scripts/mac/macbuild b/distrib/scripts/mac/macbuild
index 2dc554d4a88349b389ebf47e9ef1bfe7e8e57d57..ede1414a74bbac7cc836b82554cab869254061a2 100755 (executable)
--- a/distrib/scripts/mac/macbuild
+++ b/distrib/scripts/mac/macbuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
 #!/bin/sh
 

-# you need to change this if you run from outside this dir. 
+# you need to change this if you run from outside this dir.

 if [ "$WXROOT" = "" ]; then
 if [ "$WXROOT" = "" ]; then

-  WXROOT=../../..
+  scriptDir="$(cd $(dirname $0);pwd)"
+  WXROOT=$scriptDir/../../..

 fi
 
 . $WXROOT/distrib/scripts/includes/configure_build.inc
 fi
 
 . $WXROOT/distrib/scripts/includes/configure_build.inc


@@ -13,16 +14,18 @@ fi
 # configure-based build scripts, which is why this looks a little empty.
 
 if [ "$UNIVERSAL" = "1" ]; then
 # configure-based build scripts, which is why this looks a little empty.
 
 if [ "$UNIVERSAL" = "1" ]; then

-  OTHER_OPTS="--enable-universal_binary "
+  OTHER_OPTS="$OTHER_OPTS --enable-universal_binary --with-libjpeg=builtin --with-libpng=builtin"

 fi
 
 fi
 

+mkdir -p builds
+cd builds

 do_build
 
 make prefix=$INSTALLDIR install
 
 if [ "$WXPYTHON" == "1" ]; then
 do_build
 
 make prefix=$INSTALLDIR install
 
 if [ "$WXPYTHON" == "1" ]; then

-  make -C contrib/src/gizmos prefix=$INSTALLDIR install
-  make -C contrib/src/stc prefix=$INSTALLDIR install
-fi
+    make -C contrib/src/gizmos prefix=$INSTALLDIR install
+    make -C contrib/src/stc prefix=$INSTALLDIR install
+fi 

 
 cd $OLDDIR
\ No newline at end of file
 
 cd $OLDDIR
\ No newline at end of file