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

Update to work with the latest wxPython and to work with more shells. Also, get the script's directory

Browse Source 
using $0 rather than relying on it to be run from the dir it lives in.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2007-07-11 21:06:09 +00:00
parent a0a4f762d3
commit 0ebe472f38
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
distrib/scripts/includes/configure_build.inc
View File

@@ -19,45 +19,50 @@ UNICODE_OPTS="--enable-unicode"
ANSI_OPTS="--enable-ansi" ANSI_OPTS="--enable-ansi"
WXPYTHON_OPTS="--enable-monolithic \ WXPYTHON_OPTS="--with-opengl \
--with-opengl \ --enable-sound --with-sdl \
--enable-sound \ --with-gnomeprint \
--enable-mediactrl \ --enable-graphics_ctx \
--enable-display \ --enable-mediactrl \
--enable-geometry \ --enable-display \
--enable-debug_flag \ --enable-geometry \
--enable-optimise \ --enable-debug_flag \
--disable-debugreport " --enable-optimise \
--disable-debugreport "
do_build(){ do_build(){
OPTS="" OPTS=""
if [ "$WXPYTHON" == "1" ]; then if [ "$WXPYTHON" = "1" ]; then
OPTS="$WXPYTHON_OPTS" OPTS="$WXPYTHON_OPTS"
fi fi
if [ "$DEBUG" == "1" ]; then if [ "$DEBUG" = "1" ]; then
OPTS="$OPTS $DEBUG_OPTS " OPTS="$OPTS $DEBUG_OPTS "
fi fi
if [ "$UNICODE" == "1" ]; then if [ "$UNICODE" = "1" ]; then
OPTS="$OPTS $UNICODE_OPTS " OPTS="$OPTS $UNICODE_OPTS "
fi fi
if [ "$STATIC" == "1" ]; then if [ "$STATIC" = "1" ]; then
OPTS="$OPTS --enable-static" OPTS="$OPTS --enable-static"
fi fi
OPTS="$OPTS $OTHER_OPTS" OPTS="$OPTS $OTHER_OPTS"
echo "$WXROOT/configure --prefix=$BUILDPREFIX $OPTS"
$WXROOT/configure --prefix=$BUILDPREFIX $OPTS $WXROOT/configure --prefix=$BUILDPREFIX $OPTS
make make
if [ $? != 0 ]; then
echo "wxWidgets build failed."
exit $?
fi
# build the libs wxPython needs # build the libs wxPython needs
if [ "$WXPYTHON" == "1" ]; then if [ "$WXPYTHON" = "1" ]; then
make -C contrib/src/animate
make -C contrib/src/gizmos make -C contrib/src/gizmos
make -C contrib/src/stc make -C contrib/src/stc
fi fi

14
distrib/scripts/unix/unixbuild
View File

@@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# 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 fi
. $WXROOT/distrib/scripts/includes/configure_build.inc . $WXROOT/distrib/scripts/includes/configure_build.inc
@@ -32,13 +32,19 @@ for i in "$@"; do
esac esac
done done
OTHER_OPTS="--with-$PORT " if [ "$PORT" != "" ]; then
OTHER_OPTS="--with-$PORT "
fi
do_build do_build
if [ $? != 0 ]; then
exit $?
fi
make prefix=$INSTALLDIR install make prefix=$INSTALLDIR install
if [ "$WXPYTHON" == "1" ]; then if [ "$WXPYTHON" = "1" ]; then
make -C contrib/src/gizmos prefix=$INSTALLDIR install make -C contrib/src/gizmos prefix=$INSTALLDIR install
make -C contrib/src/stc prefix=$INSTALLDIR install make -C contrib/src/stc prefix=$INSTALLDIR install
fi fi