diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-18 08:24:42 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-18 08:24:42 +0000 |
| commit | e7e42201329dfebbd3e9952527ef7e90f0de3e4a (patch) | |
| tree | ecb69212ef0c38e01bdeb4033fc814c9da959aaa /trunk/release | |
| parent | d428d76746e6f39b9bc4f686cb73e48ac67a5302 (diff) | |
Modify OS X universal binary creation process to give the user more control over the 32-bit fork (necessary for building universal binaries with libjpeg v7/v8b emulation, for instance)
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@281 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/release')
| -rw-r--r-- | trunk/release/makemacpkg | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/trunk/release/makemacpkg b/trunk/release/makemacpkg index b1fb90e..c7f3fbd 100644 --- a/trunk/release/makemacpkg +++ b/trunk/release/makemacpkg @@ -17,7 +17,7 @@ onexit() usage() { - echo "$0 <package name> <version> <build> <source dir.> [universal]" + echo "$0 <package name> <version> <build> <source dir.> [32-bit build dir]" exit 1 } @@ -29,7 +29,8 @@ VERSION=$2 BUILD=$3 SRCDIR=$4 if [ $# -gt 4 ]; then - if [ "$5" = "universal" ]; then UNIVERSAL=1; fi + BUILDDIR32=$5 + UNIVERSAL=1 fi PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker @@ -50,15 +51,16 @@ mkdir -p $PKGROOT/usr/include mv $PKGROOT/opt/$PACKAGE_NAME/include/turbojpeg.h $PKGROOT/usr/include if [ $UNIVERSAL = 1 ]; then - if [ ! -d $SRCDIR/osxx86 ]; then - mkdir -p $SRCDIR/osxx86 + if [ ! -d $BUILDDIR32 ]; then + echo ERROR: 32-bit build directory $BUILDDIR32 does not exist + exit 1 + fi + if [ ! -f $BUILDDIR32/Makefile ]; then + echo ERROR: 32-bit build directory $BUILDDIR32 is not configured + exit 1 fi mkdir -p $TMPDIR/dist.x86 - pushd $SRCDIR/osxx86 - sh $SRCDIR/configure --with-pic \ - CFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -O3 -m32' \ - CXXFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -O3 -m32' \ - LDFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -m32' + pushd $BUILDDIR32 make install DESTDIR=$TMPDIR/dist.x86 popd if [ ! -h $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib -a \ |