X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c2accfc9da0da74a8176823a6ca789f17477476..13220cca727ed74c2998b4fb89a4d80aacf28e68:/wxPython/b?ds=inline

diff --git a/wxPython/b b/wxPython/b
index 5c97518e56..e748313184 100755
--- 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
@@ -29,8 +36,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"
@@ -126,10 +134,12 @@ fi
 
 echo $CMD
 eval $CMD
+RC=$?
 
-
-if [ "$OTHERCMD" != "" ]; then
+if [ "$RC" = "0" -a  "$OTHERCMD" != "" ]; then
     echo $OTHERCMD
     $OTHERCMD
+    RC=$?
 fi
 
+exit $RC