diff options
| -rw-r--r-- | make.mk | 11 | ||||
| -rwxr-xr-x | movement/make/make_alternate_fw.sh | 4 |
2 files changed, 13 insertions, 2 deletions
@@ -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 bd8154ef..575c9e52 100755 --- 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/" |