From 42a5c14ec3a3e3da70be9c2caf63ea4758f7420a Mon Sep 17 00:00:00 2001 From: otavepto Date: Fri, 8 Mar 2024 02:24:25 +0200 Subject: [PATCH] allow -j 1 for build scripts --- build_linux.sh | 2 +- build_linux_deps.sh | 2 +- build_win.bat | 12 ++++++------ build_win_deps.bat | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build_linux.sh b/build_linux.sh index 32eb0639..3ff44e09 100644 --- a/build_linux.sh +++ b/build_linux.sh @@ -101,7 +101,7 @@ done # use 70% build_threads="$(( $(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 0) * 70 / 100 ))" [[ $PARALLEL_THREADS_OVERRIDE -gt 0 ]] && build_threads="$PARALLEL_THREADS_OVERRIDE" -[[ $build_threads -lt 2 ]] && build_threads=2 +[[ $build_threads -lt 1 ]] && build_threads=1 # build type optimize_level="" diff --git a/build_linux_deps.sh b/build_linux_deps.sh index 84198dbd..1c5422ab 100644 --- a/build_linux_deps.sh +++ b/build_linux_deps.sh @@ -105,7 +105,7 @@ echo; echo; # use 70% build_threads="$(( $(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 0) * 70 / 100 ))" [[ $PARALLEL_THREADS_OVERRIDE -gt 0 ]] && build_threads="$PARALLEL_THREADS_OVERRIDE" -[[ $build_threads -lt 2 ]] && build_threads=2 +[[ $build_threads -lt 1 ]] && build_threads=1 ############## common CMAKE args ############## diff --git a/build_win.bat b/build_win.bat index 164be3e3..da011d35 100644 --- a/build_win.bat +++ b/build_win.bat @@ -119,8 +119,8 @@ if defined NUMBER_OF_PROCESSORS ( if %PARALLEL_THREADS_OVERRIDE% gtr 0 ( set /a build_threads=PARALLEL_THREADS_OVERRIDE ) -if %build_threads% lss 2 ( - set /a build_threads=2 +if %build_threads% lss 1 ( + set /a build_threads=1 ) :: build type @@ -552,7 +552,7 @@ endlocal & exit /b %_exit% :compile_experimental_lib32 setlocal echo // building lib experimental steam_api.dll - 32 - set src_files="%win_resources_out_dir%\rsrc-api-32.res" %release_src% "%libs_dir%\detours\*.cpp" controller/gamepad.c "overlay_experimental\*.cpp" + set src_files="%win_resources_out_dir%\rsrc-api-32.res" %release_src% "%libs_dir%\detours\*.cpp" "controller\gamepad.c" "overlay_experimental\*.cpp" set extra_inc_dirs=%overlay_inc32% set extra_libs=%overlay_lib32% call :build_for 1 0 "%experimental_dir%\x32\steam_api.dll" src_files extra_inc_dirs "/DEMU_EXPERIMENTAL_BUILD /DCONTROLLER_SUPPORT /DEMU_OVERLAY /DImTextureID=ImU64" extra_libs @@ -578,7 +578,7 @@ endlocal & exit /b %_exit% :compile_experimentalclient_32 setlocal echo // building lib steamclient.dll - 32 - set src_files="%win_resources_out_dir%\rsrc-client-32.res" %release_src% "%libs_dir%\detours\*.cpp" controller/gamepad.c "overlay_experimental\*.cpp" + set src_files="%win_resources_out_dir%\rsrc-client-32.res" %release_src% "%libs_dir%\detours\*.cpp" "controller\gamepad.c" "overlay_experimental\*.cpp" set extra_inc_dirs=%overlay_inc32% set extra_libs=%overlay_lib32% call :build_for 1 0 "%steamclient_dir%\steamclient.dll" src_files extra_inc_dirs "/DEMU_EXPERIMENTAL_BUILD /DCONTROLLER_SUPPORT /DEMU_OVERLAY /DImTextureID=ImU64 /DSTEAMCLIENT_DLL" extra_libs @@ -670,7 +670,7 @@ endlocal & exit /b %_exit% :compile_experimental_lib64 setlocal echo // building lib experimental steam_api64.dll - 64 - set src_files="%win_resources_out_dir%\rsrc-api-64.res" %release_src% "%libs_dir%\detours\*.cpp" controller/gamepad.c "overlay_experimental\*.cpp" + set src_files="%win_resources_out_dir%\rsrc-api-64.res" %release_src% "%libs_dir%\detours\*.cpp" "controller\gamepad.c" "overlay_experimental\*.cpp" set extra_inc_dirs=%overlay_inc64% set extra_libs=%overlay_lib64% call :build_for 0 0 "%experimental_dir%\x64\steam_api64.dll" src_files extra_inc_dirs "/DEMU_EXPERIMENTAL_BUILD /DCONTROLLER_SUPPORT /DEMU_OVERLAY /DImTextureID=ImU64" extra_libs @@ -696,7 +696,7 @@ endlocal & exit /b %_exit% :compile_experimentalclient_64 setlocal echo // building lib steamclient64.dll - 64 - set src_files="%win_resources_out_dir%\rsrc-client-64.res" %release_src% "%libs_dir%\detours\*.cpp" controller/gamepad.c "overlay_experimental\*.cpp" + set src_files="%win_resources_out_dir%\rsrc-client-64.res" %release_src% "%libs_dir%\detours\*.cpp" "controller\gamepad.c" "overlay_experimental\*.cpp" set extra_inc_dirs=%overlay_inc64% set extra_libs=%overlay_lib64% call :build_for 0 0 "%steamclient_dir%\steamclient64.dll" src_files extra_inc_dirs "/DEMU_EXPERIMENTAL_BUILD /DCONTROLLER_SUPPORT /DEMU_OVERLAY /DImTextureID=ImU64 /DSTEAMCLIENT_DLL" extra_libs diff --git a/build_win_deps.bat b/build_win_deps.bat index fa036de5..5795147c 100644 --- a/build_win_deps.bat +++ b/build_win_deps.bat @@ -63,8 +63,8 @@ if %PARALLEL_THREADS_OVERRIDE% gtr 0 ( set /a jobs_count=PARALLEL_THREADS_OVERRIDE ) -if %jobs_count% lss 2 ( - set /a jobs_count=2 +if %jobs_count% lss 1 ( + set /a jobs_count=1 )