applied patch #1356901 "Yet another removal of extra semicolons", also fixed remainin...

[wxWidgets.git] / wxPython / b

diff --git a/wxPython/b b/wxPython/b
index 699d41eef31a71debba71ec10dff35ffa874415c..ffa2477fb1a2eb45b3204649304e8a5a4d70cecb 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -1,4 +1,11 @@
-#!/bin/sh
+#!/bin/bash
+
+# Are we using bash on win32?  If so source that file and then exit.
+if [ "$OSTYPE" = "cygwin" ]; then
+    source b.win32
+    exit
+fi
+
 
 function getpyver {
     if [ "$1" = "15" ]; then
@@ -11,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
@@ -29,8 +38,9 @@ OTHERFLAGS=""
 PORTFLAGS=""
 
 
-if [ "$1" = "gtk1" ]; then 
-    PORTFLAGS=""
+
+if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then 
+    PORTFLAGS="WXPORT=gtk UNICODE=0"
     shift
 elif [ "$1" = "gtk2" ]; then 
     PORTFLAGS="WXPORT=gtk2 UNICODE=1"