Move parallel flag into makefile with crossplatform support

diff --git a/make.mk b/make.mk
index d7fecd20e0fa943ba9f61953f72eb95fad692323..3424f9c9274bfc515fc1c3f7edf593a0764361f7 100644 (file)
--- a/make.mk
+++ b/make.mk
@@ -29,6 +29,17 @@ else
   MKDIR = mkdir
 endif
 
+ifeq ($(DETECTED_OS), LINUX)
+  MAKEFLAGS += -j `nproc`
+endif
+ifeq ($(DETECTED_OS), OSX)
+  NPROCS = $(shell sysctl hw.ncpu  | grep -o '[0-9]\+')
+  MAKEFLAGS += -j $(NPROCS)
+endif
+ifeq ($(DETECTED_OS), WINDOWS)
+  MAKEFLAGS += -j $(NUMBER_OF_PROCESSORS)
+endif
+
 ifndef EMSCRIPTEN
 CC = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy

diff --git a/movement/make/make_alternate_fw.sh b/movement/make/make_alternate_fw.sh
index bd8154efc47ae2206997c791204d42f2ad27a175..575c9e52cdf9b7a30c984242b5c89d612c6b704b 100755 (executable)
--- a/movement/make/make_alternate_fw.sh
+++ b/movement/make/make_alternate_fw.sh
@@ -22,11 +22,11 @@ do
     do
         COLOR=$(echo "$color" | tr '[:lower:]' '[:upper:]')
         make clean
-        make LED=$COLOR FIRMWARE=$VARIANT -j `nproc`
+        make LED=$COLOR FIRMWARE=$VARIANT
         mv "build/watch.uf2" "$fw_dir/$variant-$color.uf2"
     done
     make clean
-    emmake make FIRMWARE=$VARIANT -j `nproc`
+    emmake make FIRMWARE=$VARIANT
     mkdir "$sim_dir/$variant/"
     mv "build/watch.wasm" "$sim_dir/$variant/"
     mv "build/watch.js" "$sim_dir/$variant/"