Make - using automatic number of cores (#7849)

#changelog #make

Author: dimitre

libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk

@@ -136,7 +136,7 @@ endif
 
 Debug:
 	@echo Compiling OF library for Debug
-	$(MAKE) -C $(OF_ROOT)/libs/openFrameworksCompiled/project/ Debug PLATFORM_OS=$(PLATFORM_OS) ABIS_TO_COMPILE_DEBUG="$(ABIS_TO_COMPILE_DEBUG)"
+	$(MAKE) -j -C $(OF_ROOT)/libs/openFrameworksCompiled/project/ Debug PLATFORM_OS=$(PLATFORM_OS) ABIS_TO_COMPILE_DEBUG="$(ABIS_TO_COMPILE_DEBUG)"
 	@echo
 	@echo
 	@echo Compiling $(APPNAME) for Debug

scripts/ci/addons/build.cmd

@@ -7,6 +7,6 @@ if "%BUILDER%"=="VS" (
 
 if "%BUILDER%"=="MSYS2" (    
      for /D %%e in (addons\%APPVEYOR_PROJECT_NAME%\example*) do (
-         %MSYS2_PATH%\usr\bin\bash -lc "make -j2 -C addons/%APPVEYOR_PROJECT_NAME%/%%~ne Debug"
+         %MSYS2_PATH%\usr\bin\bash -lc "make -j -C addons/%APPVEYOR_PROJECT_NAME%/%%~ne Debug"
      )
 )

scripts/ci/addons/build.sh

@@ -37,7 +37,7 @@ elif [ "$TARGET" == "linuxarmv7l" ]; then
         export CXXFLAGS="${CXXFLAGS} -ftrack-macro-expansion=0";
         export GCCVER=7.1.1
         cd \$1
-        make -j2 DebugNoOF PLATFORM_VARIANT=raspberry2
+        make -j DebugNoOF PLATFORM_VARIANT=raspberry2
 EOF
     export PATH=~/.local/share/junest/bin:$PATH
     chmod 755 build_junest.sh
@@ -70,18 +70,18 @@ if ls example* 1> /dev/null 2>&1; then
         if [ "$TARGET" == "android" ]; then
             cd $example
             echo "ABIS_TO_COMPILE_DEBUG = $OPT" >> config.make
-            make -j2 DebugNoOF PLATFORM_OS=Android
+            make -j DebugNoOF PLATFORM_OS=Android
             cd ..
         elif [ "$TARGET" == "emscripten" ]; then
             cd $example
-            emmake make -j2 DebugNoOF
+            emmake make -j DebugNoOF
             cd ..
         elif [ "$TARGET" == "linuxarmv7l" ]; then
             #make DebugNoOF PLATFORM_VARIANT=raspberry2
             junest ./build_junest.sh $(cd $example; pwd -P)
         else
             cd $example
-            make -j2 DebugNoOF
+            make -j DebugNoOF
             cd ..
         fi
     done

scripts/ci/android/install.sh

@@ -53,7 +53,7 @@ else
     cd $OF_ROOT/
     scripts/linux/download_libs.sh
     cd $OF_ROOT/apps/projectGenerator/commandLine
-    make -j2 Debug -C .
+    make -j Debug -C .
     ret=$?
     if [ $ret -ne 0 ]; then
           echo "Failed building Project Generator"

scripts/ci/emscripten/build.sh

@@ -15,11 +15,11 @@ cd $ROOT
 #echo "PLATFORM_CFLAGS += $CUSTOMFLAGS" >> libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk
 sed -i "s/PLATFORM_OPTIMIZATION_CFLAGS_DEBUG = .*/PLATFORM_OPTIMIZATION_CFLAGS_DEBUG = -g0/" libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk
 cd libs/openFrameworksCompiled/project
-emmake make -j2 Debug # USE_CCACHE=1
+emmake make -j Debug # USE_CCACHE=1
 
 echo "**** Building emptyExample ****"
 cd $ROOT/scripts/templates/linux64
-emmake make -j2 Debug # USE_CCACHE=1
+emmake make -j Debug # USE_CCACHE=1
 
 echo "**** Building allAddonsExample ****"
 cd $ROOT
@@ -45,4 +45,4 @@ sed -i "s/ofxKinect kinect;//" src/ofApp.h
 sed -i "s/ofxThreadedImageLoader .*;//" src/ofApp.h
 sed -i "s/ofxXmlPoco .*;//" src/ofApp.h
 
-emmake make -j2 Debug # USE_CCACHE=1
+emmake make -j Debug # USE_CCACHE=1

scripts/ci/emscripten/examples_to_build.sh

@@ -191,7 +191,7 @@ for folder in "${folders[@]}"; do
         cd $folder
         cp ../../../scripts/templates/emscripten/Makefile .
 		cp ../../../scripts/templates/emscripten/config.make .
-        emmake make -j2 Release
+        emmake make -j Release
 
         errorcode=$?
 		if [[ $errorcode -ne 0 ]]; then

scripts/ci/linux64/build.sh

@@ -25,16 +25,16 @@ else
     echo "PLATFORM_CFLAGS += $CUSTOMFLAGS" >> libs/openFrameworksCompiled/project/linux64/config.linux64.default.mk
     sed -i "s/PLATFORM_OPTIMIZATION_CFLAGS_DEBUG = .*/PLATFORM_OPTIMIZATION_CFLAGS_DEBUG = -g0/" libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk
     cd libs/openFrameworksCompiled/project
-    make -j2
+    make -j
 
     echo "**** Building emptyExample ****"
     cd $ROOT/scripts/templates/linux64
-    make -j2
+    make -j
 
     echo "**** Building allAddonsExample ****"
     cd $ROOT
     cp scripts/templates/linux64/Makefile examples/templates/allAddonsExample/
     cp scripts/templates/linux64/config.make examples/templates/allAddonsExample/
     cd examples/templates/allAddonsExample/
-    make -j2
+    make -j
 fi

scripts/ci/linux64/run_tests.sh

@@ -15,7 +15,7 @@ else
 					cd $test
 					cp ../../../scripts/templates/linux/Makefile .
 					cp ../../../scripts/templates/linux/config.make .
-					make -j2 Debug
+					make -j Debug
 					cd bin
 					binname=$(basename ${test})
 	                #gdb -batch -ex "run" -ex "bt" -ex "q \$_exitcode" ./${binname}_debug

scripts/ci/linuxaarch64/build.sh

@@ -23,12 +23,12 @@ cd $OF_ROOT
 cp scripts/templates/linuxaarch64/Makefile examples/templates/emptyExample/
 cp scripts/templates/linuxaarch64/config.make examples/templates/emptyExample/
 cd examples/templates/emptyExample/
-make Debug -j2
+make Debug -j
 
 #TODO:
 #echo "**** Building allAddonsExample ****"
 #cd $OF_ROOT
 #cp scripts/templates/linuxaarch64/Makefile examples/templates/allAddonsExample/
 #cp scripts/templates/linuxaarch64/config.make examples/templates/allAddonsExample/
 #cd examples/templates/allAddonsExample/
-#make Debug -j2
+#make Debug -j

scripts/ci/linuxarmv6l/build.sh

@@ -25,11 +25,11 @@ cd $OF_ROOT
 cp scripts/templates/linuxarmv6l/Makefile examples/templates/emptyExample/
 cp scripts/templates/linuxarmv6l/config.make examples/templates/emptyExample/
 cd examples/templates/emptyExample/
-make Debug -j2
+make Debug -j
 
 echo "**** Building allAddonsExample ****"
 cd $OF_ROOT
 cp scripts/templates/linuxarmv6l/Makefile examples/templates/allAddonsExample/
 cp scripts/templates/linuxarmv6l/config.make examples/templates/allAddonsExample/
 cd examples/templates/allAddonsExample/
-make Debug -j2
+make Debug -j