move some definitions out of datacmn.cpp

[wxWidgets.git] / wxPython / b

diff --git a/wxPython/b b/wxPython/b
index ffa2477fb1a2eb45b3204649304e8a5a4d70cecb..78c8654efe031147b5020d3e11519f2416a51505 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -6,6 +6,11 @@ if [ "$OSTYPE" = "cygwin" ]; then
     exit
 fi
 
+# make it easy to switch versions of SWIG
+if [ "$SWIG" = "" ]; then
+  SWIG=/opt/swig/bin/swig-1.3.29
+fi
+
 
 function getpyver {
     if [ "$1" = "15" ]; then
@@ -20,6 +25,8 @@ function getpyver {
        PYVER=2.3
     elif [ "$1" = "24" ]; then
        PYVER=2.4
+    elif [ "$1" = "25" ]; then
+       PYVER=2.5
     else
        echo You must specify Python version as first parameter.
         exit
@@ -33,22 +40,31 @@ 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" 
+FLAGS="USE_SWIG=1 SWIG=$SWIG" 
 OTHERFLAGS=""
 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"