Commit faf7b634 authored by Ben Cooksley's avatar Ben Cooksley

Switch Windows builds to use Ninja instead of JOM - hopefully this will improve performance a bit

parent 4d96bd9a
Pipeline #13947 skipped with stage
......@@ -31,7 +31,7 @@ makeCommand = "make -j {cpuCount} -l {maximumLoad}"
# Windows is a bit special though
if sys.platform == 'win32':
# We use NMake on Windows at the moment
makeCommand = "jom"
makeCommand = "ninja -j {cpuCount} -l {maximumLoad}"
# FreeBSD also likes to do things slightly different
if sys.platform == 'freebsd12':
makeCommand = "gmake -j {cpuCount} -l {maximumLoad}"
......
......@@ -77,7 +77,7 @@ class CMake(object):
# Are we on Windows?
if sys.platform == 'win32':
# We want a NMake based build, rather than the default MSBuild
cmakeCommand.append('-G "NMake Makefiles JOM"')
cmakeCommand.append('-G "Ninja"')
# Are we building for Android?
if 'ANDROID_NDK' in buildEnvironment and sys.platform == 'linux':
......
......@@ -38,7 +38,7 @@ makeCommand = "make -j {cpuCount} -l {maximumLoad} install"
# Windows is a bit special though
if sys.platform == 'win32':
# We use NMake on Windows at the moment
makeCommand = "jom install"
makeCommand = "ninja -j {cpuCount} -l {maximumLoad} install"
# FreeBSD also likes to do things slightly different
if sys.platform == 'freebsd12':
makeCommand = "gmake -j {cpuCount} install"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment