X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f60a22bd94d8d14ee3a0a9c938e793ba79c240f4..1d6e57680c6c506a9ebc717a50acbfe687cad60d:/wxPython/b.win32

diff --git a/wxPython/b.win32 b/wxPython/b.win32
index 80fbae2007..8444a1dece 100644
--- a/wxPython/b.win32
+++ b/wxPython/b.win32
@@ -1,26 +1,47 @@
 #!/bin/bash
 # ----------------------------------------------------------------------
 
+# To Robin: I tried to avoid making any changes to the existing
+# build scripts, but my env requires me to specify Windows paths...
+# if this breaks something at your end, let me know and we can
+# figure out some solution for both of us.
+if [ "$SWIGDIR" = "" ]; then
+  SWIGDIR=$PROJECTS\\SWIG-1.3.27
+fi
 
-FLAGS="USE_SWIG=1 SWIG=e:/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 ;;
 
-    *) 	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
@@ -91,7 +112,7 @@ elif [ "$1" = "b" ]; then
     $0 $VER   $@
     $0 $VER h $@
 
-# (no command arg) --> normal build for development
+# (no command arg) --> normal debug build for development
 else
     CMD="$SETUP $FLAGS HYBRID=0 build_ext --inplace --debug $@"
 fi