New makefile and modified .def file supporting the xpmdecod module.

[wxWidgets.git] / wxPython / b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 8c3b04a970a93a6a8315970cfdfbc57f5d438647..afe0718200261ab870ed24673d9c39799596427c 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -5,14 +5,17 @@ set FLAGS=USE_SWIG=1 IN_CVS_TREE=1
 
 
 rem  Use non-default python?
-iff "%1" == "15" .or. "%1" == "20" then
-       set SETUP=c:\tools\python%1%\python.exe -u setup.py
+iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" then
+       set PYTHON=c:\tools\python%1%\python.exe
        shift
 else
-       set SETUP=python -u setup.py
+       set PYTHON=python
 endiff
+set SETUP=%PYTHON% -u setup.py
 
 
+%PYTHON% -c "import sys;print '\n', sys.version, '\n'"
+
 
 rem "c" --> clean
 iff "%1" == "c" then
@@ -40,9 +43,14 @@ elseiff "%1" == "f" then
        shift
        set CMD=%SETUP% %FLAGS% FINAL=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
 
+rem "h" --> HYBRID
+elseiff "%1" == "h" then
+       shift
+       set CMD=%SETUP% %FLAGS% HYBRID=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
+
 rem (no command arg) --> normal build for development
 else
-       set CMD=%SETUP% %FLAGS% HYBRID=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
+       set CMD=%SETUP% %FLAGS% HYBRID=0 build_ext --inplace --debug %1 %2 %3 %4 %5 %6 %7 %8 %9
 endiff
 
 
@@ -51,6 +59,7 @@ echo %CMD%
 %CMD%
 
 iff "%OTHERCMD%" != "" then
+       echo %OTHERCMD%
        %OTHERCMD%
 endiff