Fix MSVCBuilder so it can pass an alternate make command to the Builder

[wxWidgets.git] / build / tools / build-wxwidgets.py

diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py
index 3c5bf07e5c2d4617428c1071cce55ee322b12ab9..1b246def4fc6a45f38d705a87ef2977b0317432e 100755 (executable)
--- a/build/tools/build-wxwidgets.py
+++ b/build/tools/build-wxwidgets.py
@@ -26,6 +26,7 @@ contribDir = None
 options = None
 configure_opts = None
 exitWithException = True
+nmakeCommand = 'nmake.exe'
 
 verbose = False
 
@@ -60,8 +61,12 @@ def getXcodePath():
 
 def getVisCVersion():
     text = getoutput("cl.exe")
+    if 'Version 13' in text:
+        return '71'
     if 'Version 15' in text:
         return '90'
+    if 'Version 16' in text:
+        return '100'
     # TODO: Add more tests to get the other versions...
     else:
         return 'FIXME'
@@ -166,6 +171,7 @@ def main(scriptName, args):
     global options
     global configure_opts
     global wxBuilder
+    global nmakeCommand
     
     scriptDir = os.path.dirname(os.path.abspath(scriptName))
     wxRootDir = os.path.abspath(os.path.join(scriptDir, "..", ".."))
@@ -212,6 +218,7 @@ def main(scriptName, args):
         "extra_make"    : ("", "Extra args to pass on [n]make's command line."),
         "features"      : ("", "A comma-separated list of wxUSE_XYZ defines on Win, or a list of configure flags on unix."),
         "verbose"       : (False, "Print commands as they are run, (to aid with debugging this script)"),
+        "jom"           : (False, "Use jom.exe instead of nmake for MSW builds."),
     }
         
     parser = optparse.OptionParser(usage="usage: %prog [options]", version="%prog 1.0")
@@ -435,8 +442,11 @@ def main(scriptName, args):
                 args.append(
                     "CPPFLAGS=/I%s" %
                      os.path.join(os.environ.get("CAIRO_ROOT", ""), 'include\\cairo'))
+                
+            if options.jom:
+                nmakeCommand = 'jom.exe'
     
-            wxBuilder = builder.MSVCBuilder()
+            wxBuilder = builder.MSVCBuilder(commandName=nmakeCommand)
             
         if toolkit == "msvcProject":
             args = []