diff --git a/helpers/compile-build.py b/helpers/compile-build.py index 59940f635b5ac011f77404abdcf5f1b8c0b0ed22..aff6be8be80a0bf84f14f32352800079cf3d27d8 100755 --- a/helpers/compile-build.py +++ b/helpers/compile-build.py @@ -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}" diff --git a/helpers/helperslib/BuildSystem.py b/helpers/helperslib/BuildSystem.py index 45054739d69e675c23b1fc746bf371e4576015af..891443f7c68acb8ae0d0c526619f3fd6f142b706 100644 --- a/helpers/helperslib/BuildSystem.py +++ b/helpers/helperslib/BuildSystem.py @@ -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': diff --git a/helpers/install-build.py b/helpers/install-build.py index 10c3c9f52cbd889ed9343ac1f3336a31119f51c0..43ed1d7fc02b07ef80f10563745af6f4373b64f4 100755 --- a/helpers/install-build.py +++ b/helpers/install-build.py @@ -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"