test for GL/glu.h too (fixes part of bug 879474)

[wxWidgets.git] / wxPython / b.win32

diff --git a/wxPython/b.win32 b/wxPython/b.win32
index 8444a1decec832d1a7daad8e359a8b81976b5306..5f4908879b26ed6e8d4f489629e87094ecb718f2 100644 (file)
--- a/wxPython/b.win32
+++ b/wxPython/b.win32
@@ -1,12 +1,8 @@
 #!/bin/bash
 # ----------------------------------------------------------------------
 
 #!/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
 if [ "$SWIGDIR" = "" ]; then

-  SWIGDIR=$PROJECTS\\SWIG-1.3.27
+  SWIGDIR=$PROJECTS\\SWIG-1.3.29

 fi
 
 
 fi
 
 


@@ -16,6 +12,7 @@ case $1 in
     22 | 2.2) VER=22; shift ;;
     23 | 2.3) VER=23; shift ;;
     24 | 2.4) VER=24; 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 ;;

 
     *)         VER=24
 esac
 
     *)         VER=24
 esac


@@ -90,20 +87,20 @@ elif [ "$1" = "a" ]; then
     shift
     CMD=
 
     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 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
 
 # "b" --> both debug and hybrid builds
 elif [ "$1" = "b" ]; then