Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac lipo build patch from Kevin O.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-06-07 18:43:02 +00:00
parent c824de2497
commit d2a924d5f2
4 changed files with 108 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
wxPython/distrib/mac/wxPythonOSX/build
View File

@@ -276,7 +276,10 @@ if [ $skipbuild != yes ]; then
export WXROOT
export BUILDPREFIX=$PREFIX
export INSTALLDIR=$INSTALLROOT$PREFIX
$WXDIR/distrib/scripts/mac/macbuild wxpython universal $CHARTYPE
$WXDIR/distrib/scripts/mac/macbuild-lipo wxpython $CHARTYPE
if [ $? != 0 ]; then
exit $?
fi
else
make $MAKEJOBS
make $MAKEJOBS -C contrib/src/gizmos
@@ -289,20 +292,60 @@ if [ $skipbuild != yes ]; then
fi
# Build wxPython
if [ $universal = yes ]; then
# build ppc, then i386, then lipo them together
ARCH=ppc
export CXX="g++-3.3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030"
export CC="gcc-3.3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030"
export MACOSX_DEPLOYMENT_TARGET=10.3
mkdir -p $INSTALLROOT/$ARCH
mkdir -p $WXBLD/$ARCH
echo "Building wxPython for PPC..."
cd $WXROOT/wxPython
$PYTHON setup.py \
UNICODE=$PYUNICODEOPT \
NO_SCRIPTS=1 \
EP_ADD_OPTS=1 \
WX_CONFIG="$INSTALLROOT/$PREFIX/bin/wx-config --prefix=$INSTALLROOT$PREFIX" \
BUILD_BASE=$WXBLD/$ARCH/wxPython \
ARCH="$ARCH" \
build
ARCH=i386
export CXX="g++-4.0 -arch i386"
export CC="gcc-4.0 -arch i386"
export MACOSX_DEPLOYMENT_TARGET=10.4
mkdir -p $INSTALLROOT/$ARCH
mkdir -p $WXBLD/$ARCH
echo "Building wxPython for Intel..."
cd $WXROOT/wxPython
$PYTHON setup.py \
UNICODE=$PYUNICODEOPT \
NO_SCRIPTS=1 \
EP_ADD_OPTS=1 \
WX_CONFIG="$INSTALLROOT/$PREFIX/bin/wx-config --prefix=$INSTALLROOT$PREFIX" \
BUILD_BASE=$WXBLD/$ARCH/wxPython \
ARCH="$ARCH" \
build
else
cd $WXROOT/wxPython
$PYTHON setup.py \
UNICODE=$PYUNICODEOPT \
NO_SCRIPTS=1 \
EP_ADD_OPTS=1 \
WX_CONFIG="$WXBLD_CONFIG --inplace" \
BUILD_BASE=$WXBLD/wxPython \
SWIG=$SWIGBIN \
USE_SWIG=$SWIGIT \
build
fi
fi
#----------------------------------------------------------------------
if [ $skipinstall != yes ]; then
# Install wxWidgets
cd $WXBLD
@@ -317,17 +360,51 @@ if [ $skipinstall != yes ]; then
rm wx-config
ln -s ../lib/wx/config/* wx-config
# and wxPython
if [ $universal == yes ]; then
ARCH=ppc
export CXX="g++-3.3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030"
export CC="gcc-3.3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1030"
export MACOSX_DEPLOYMENT_TARGET=10.3
cd $WXROOT/wxPython
$PYTHON setup.py \
UNICODE=$PYUNICODEOPT \
NO_SCRIPTS=1 \
EP_ADD_OPTS=1 \
WX_CONFIG="$INSTALLROOT$PREFIX/bin/wx-config --prefix=$INSTALLROOT$PREFIX" \
BUILD_BASE=$WXBLD/$ARCH/wxPython \
install \
--root=$INSTALLROOT/$ARCH
ARCH=i386
export CXX="g++-4.0 -arch i386"
export CC="gcc-4.0 -arch i386"
export MACOSX_DEPLOYMENT_TARGET=10.4
cd $WXROOT/wxPython
$PYTHON setup.py \
UNICODE=$PYUNICODEOPT \
NO_SCRIPTS=1 \
EP_ADD_OPTS=1 \
WX_CONFIG="$INSTALLROOT$PREFIX/bin/wx-config --prefix=$INSTALLROOT$PREFIX" \
BUILD_BASE=$WXBLD/$ARCH/wxPython \
install \
--root=$INSTALLROOT/$ARCH
echo "Lipoing $INSTALLROOT/ppc and $INSTALLROOT/i386..."
$PYTHON $WXROOT/distrib/scripts/mac/lipo-dir.py $INSTALLROOT/ppc $INSTALLROOT/i386 $INSTALLROOT
rm -rf $INSTALLROOT/ppc $INSTALLROOT/i386
else
cd $WXROOT/wxPython
$PYTHON setup.py \
UNICODE=$PYUNICODEOPT \
NO_SCRIPTS=1 \
EP_ADD_OPTS=1 \
WX_CONFIG="$INSTALLROOT$PREFIX/bin/wx-config --prefix=$INSTALLROOT$PREFIX" \
BUILD_BASE=$WXBLD/wxPython \
install \
--root=$INSTALLROOT
fi
# Apple's Python Framework (such as what comes with Panther)
# sym-links the site-packages dir in the framework to