X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0453da6205d54b89185da35a1738ad7a909a32c9..488867abe85683496d1af1b0fd76f0f515c94f06:/wxPython/b

diff --git a/wxPython/b b/wxPython/b
index 588bac838f..19f3569512 100755
--- a/wxPython/b
+++ b/wxPython/b
@@ -18,6 +18,8 @@ function getpyver {
 	PYVER=2.2
     elif [ "$1" = "23" ]; then
 	PYVER=2.3
+    elif [ "$1" = "24" ]; then
+	PYVER=2.4
     else
 	echo You must specify Python version as first parameter.
         exit
@@ -33,19 +35,29 @@ python$PYVER -c "import sys;print '\n', sys.version, '\n'"
 SETUP="python$PYVER -u setup.py"
 FLAGS="USE_SWIG=1 SWIG=/opt/swig/bin/swig" 
 OTHERFLAGS=""
-PORTFLAGS="WXPORT=gtk2 UNICODE=1"
+PORTFLAGS=""
+UNIFLAG="UNICODE=1"
 
 
 
 if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then 
-    PORTFLAGS="WXPORT=gtk UNICODE=0"
+    PORTFLAGS="WXPORT=gtk"
+    UNIFLAG="UNICODE=0"
     shift
 elif [ "$1" = "gtk2" ]; then 
-    PORTFLAGS="WXPORT=gtk2 UNICODE=1"
+    PORTFLAGS="WXPORT=gtk2"
+    UNIFLAG="UNICODE=1"
     shift
 fi
 
-FLAGS="$FLAGS $PORTFLAGS"
+for p in $*; do
+    if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then
+	UNIFLAG=""
+	break
+    fi
+done
+
+FLAGS="$FLAGS $PORTFLAGS $UNIFLAG"