From 317bc825f422d29cc6e5814842435fa0b6369fa6 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 22 Feb 2013 05:59:51 +0000 Subject: [PATCH] Enable using jom in place of nmake in the wxMSW build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/tools/build-wxwidgets.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py index c2974ea31b..1b246def4f 100755 --- 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 @@ -170,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, "..", "..")) @@ -216,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") @@ -439,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 = [] -- 2.47.2