X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fmacosxbuild.sh;h=3191e61ab257c39fdb578ee04efe5c6c75cf6731;hb=75635270584b5775982adbd70250a0ebc7e3e76b;hp=d9f7c1be74eaaf997e3c37f1a22d77d09d4ed7bb;hpb=9d1ad903c690121387c92c835afab398d9f80b5a;p=synfig.git

diff --git a/synfig-core/trunk/macosxbuild.sh b/synfig-core/trunk/macosxbuild.sh
index d9f7c1b..3191e61 100755
--- a/synfig-core/trunk/macosxbuild.sh
+++ b/synfig-core/trunk/macosxbuild.sh
@@ -1,18 +1,34 @@
 #!/bin/sh
 
 #OPTIONS="--disable-optimization --enable-debug"
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11R6/lib/pkgconfig
-OPTIONS=""
+
+PREFIX=/Applications/SynfigStudio.app/Contents/synfig
+
+export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11R6/lib/pkgconfig
+OPTIONS="--prefix=$PREFIX"
 #OPTIONS="$OPTIONS --enable-timelimit=120"
 #OPTIONS="$OPTIONS --enable-optimization=2"
-OPTIONS="$OPTIONS --enable-optimization=3 --enable-g5opt"
+OPTIONS="$OPTIONS --enable-optimization=3"
+#OPTIONS="$OPTIONS --enable-g5opt"
 #OPTIONS="$OPTIONS --disable-optimization"
 OPTIONS="$OPTIONS --disable-debug"
 #OPTIONS="$OPTIONS --with-vimage"
 OPTIONS="$OPTIONS --without-openexr"
+OPTIONS="$OPTIONS --disable-dependency-tracking"
+#OPTIONS="$OPTIONS --enable-universal"
+
+ARCH_FLAGS=""
+ARCH_FLAGS="$ARCH_FLAGS -arch ppc"
+ARCH_FLAGS="$ARCH_FLAGS -arch i386"
 
-CC=gcc
-CXX=g++
+LDFLAGS="-L$PREFIX/lib"
+CFLAGS="-I$PREFIX/include"
+CXXFLAGS="-I$PREFIX/include"
+
+CC="gcc $LDFLAGS $CFLAGS $ARCH_FLAGS"
+CXX="g++ $LDFLAGS $CFLAGS $ARCH_FLAGS"
+CPP="gcc -E"
+CXXCPP="g++ -E"
 
 #distcc --version && {
 #	CC=distcc
@@ -30,11 +46,14 @@ mkdir $BUILDDIR
 
 cd $BUILDDIR
 
-echo ../configure $OPTIONS CC="$CC" CXX="$CXX"
+echo ../configure $OPTIONS CC="$CC" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
+
+../configure $OPTIONS CC="$CC" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" MACOS_DEPLOYMENT_TARGET=10.4 || exit 1
 
-../configure $OPTIONS CC="$CC" CXX="$CXX" MACOS_DEPLOYMENT_TARGET=10.4 || exit 1
+make
+make install-strip
 
-make package $MAKEFLAGS
+#make package $MAKEFLAGS
 
 #make installer