X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb56afc421319d1c7d88e117969cdc5fdea5fe85..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/b.win32

diff --git a/wxPython/b.win32 b/wxPython/b.win32
index 4d8b2e8940..5f4908879b 100644
--- a/wxPython/b.win32
+++ b/wxPython/b.win32
@@ -1,26 +1,44 @@
 #!/bin/bash
 # ----------------------------------------------------------------------
 
+if [ "$SWIGDIR" = "" ]; then
+  SWIGDIR=$PROJECTS\\SWIG-1.3.29
+fi
 
-FLAGS="USE_SWIG=1 SWIG=$PROJECTS/SWIG-cvs/swig.exe"
 
 #  Use non-default python?
 case $1 in
-    21 | 2.1) VER=21 ;;
-    22 | 2.2) VER=22 ;;
-    23 | 2.3) VER=23 ;;
+    21 | 2.1) VER=21; shift ;;
+    22 | 2.2) VER=22; shift ;;
+    23 | 2.3) VER=23; shift ;;
+    24 | 2.4) VER=24; shift ;;
+    25 | 2.5) VER=25; shift ;;
 
-    *) 	echo You must specify the Python version as first parameter.
-	exit -1
+    *) 	VER=24
 esac
 
 PYTHON=$TOOLS/python$VER/python.exe
-shift
 
 SETUP="$PYTHON -u setup.py"
 $PYTHON -c "import sys;print '\n', sys.version, '\n'"
 
 
+FLAGS="USE_SWIG=1 SWIG=$SWIGDIR\\swig.exe"
+UNIFLAG="UNICODE=1"
+
+for p in $*; do
+    if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then
+	UNIFLAG=""
+	break
+    fi
+done
+
+FLAGS="$FLAGS $UNIFLAG"
+
+
+
+
+
 
 # "c" --> clean
 if [ "$1" = "c" ]; then
@@ -69,20 +87,20 @@ elif [ "$1" = "a" ]; then
     shift
     CMD=
 
-#     $0 22 d
-#     $0 22 h
-#     $0 22 r
-#     $0 22 d UNICODE=1
-#     $0 22 h UNICODE=1
-#     $0 22 r UNICODE=1
-    
-    $0 23 d
-    $0 23 h
-    $0 23 r
+    $0 23 d UNICODE=0
+    $0 23 h UNICODE=0
+    $0 23 r UNICODE=0
     $0 23 d UNICODE=1
     $0 23 h UNICODE=1
     $0 23 r UNICODE=1
 
+    $0 24 d UNICODE=0
+    $0 24 h UNICODE=0
+    $0 24 r UNICODE=0
+    $0 24 d UNICODE=1
+    $0 24 h UNICODE=1
+    $0 24 r UNICODE=1
+
 
 # "b" --> both debug and hybrid builds
 elif [ "$1" = "b" ]; then