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
This commit is contained in:
@@ -26,6 +26,7 @@ contribDir = None
|
|||||||
options = None
|
options = None
|
||||||
configure_opts = None
|
configure_opts = None
|
||||||
exitWithException = True
|
exitWithException = True
|
||||||
|
nmakeCommand = 'nmake.exe'
|
||||||
|
|
||||||
verbose = False
|
verbose = False
|
||||||
|
|
||||||
@@ -170,6 +171,7 @@ def main(scriptName, args):
|
|||||||
global options
|
global options
|
||||||
global configure_opts
|
global configure_opts
|
||||||
global wxBuilder
|
global wxBuilder
|
||||||
|
global nmakeCommand
|
||||||
|
|
||||||
scriptDir = os.path.dirname(os.path.abspath(scriptName))
|
scriptDir = os.path.dirname(os.path.abspath(scriptName))
|
||||||
wxRootDir = os.path.abspath(os.path.join(scriptDir, "..", ".."))
|
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."),
|
"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."),
|
"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)"),
|
"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")
|
parser = optparse.OptionParser(usage="usage: %prog [options]", version="%prog 1.0")
|
||||||
@@ -439,8 +442,11 @@ def main(scriptName, args):
|
|||||||
args.append(
|
args.append(
|
||||||
"CPPFLAGS=/I%s" %
|
"CPPFLAGS=/I%s" %
|
||||||
os.path.join(os.environ.get("CAIRO_ROOT", ""), 'include\\cairo'))
|
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":
|
if toolkit == "msvcProject":
|
||||||
args = []
|
args = []
|
||||||
|
Reference in New Issue
Block a user