From faf7b634dc760252c9627b44d2862d4e1245fe7a Mon Sep 17 00:00:00 2001 From: Ben Cooksley Date: Mon, 27 Jan 2020 22:25:25 +1300 Subject: [PATCH] Switch Windows builds to use Ninja instead of JOM - hopefully this will improve performance a bit --- helpers/compile-build.py | 2 +- helpers/helperslib/BuildSystem.py | 2 +- helpers/install-build.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helpers/compile-build.py b/helpers/compile-build.py index 59940f6..aff6be8 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 4505473..891443f 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 10c3c9f..43ed1d7 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" -- GitLab