adapted to new font setter

[wxWidgets.git] / wxPython / b.win32

diff --git a/wxPython/b.win32 b/wxPython/b.win32
index aac2d54f47fa71750f466c072f82b432faab2271..5f4908879b26ed6e8d4f489629e87094ecb718f2 100644 (file)
--- a/wxPython/b.win32
+++ b/wxPython/b.win32
@@ -1,15 +1,10 @@
 #!/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-cvs
+  SWIGDIR=$PROJECTS\\SWIG-1.3.29
 fi
 
-FLAGS="USE_SWIG=1 SWIG=$SWIGDIR\\swig.exe"
 
 #  Use non-default python?
 case $1 in
@@ -17,6 +12,7 @@ case $1 in
     22 | 2.2) VER=22; shift ;;
     23 | 2.3) VER=23; shift ;;
     24 | 2.4) VER=24; shift ;;
+    25 | 2.5) VER=25; shift ;;
 
     *)         VER=24
 esac
@@ -27,6 +23,22 @@ 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
@@ -75,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