diff --git a/build_linux_deps.sh b/build_linux_deps.sh index 02d133d7..3cc84ce3 100644 --- a/build_linux_deps.sh +++ b/build_linux_deps.sh @@ -370,6 +370,27 @@ EOL ingame_overlay_common_defs="'-DIMGUI_USER_CONFIG=$_imgui_cfg_file' -DINGAMEOVERLAY_USE_SYSTEM_LIBRARIES=OFF -DINGAMEOVERLAY_USE_SPDLOG=OFF -DINGAMEOVERLAY_BUILD_TESTS=OFF" +echo; echo "// building ingame_overlay [System dep x32]" +pushd "deps/System" +eval $recreate_32 +eval $cmake_gen32 -DBUILD_SYSTEMLIB_TESTS=OFF +last_code=$((last_code + $?)) +eval $cmake_build32 --target install +last_code=$((last_code + $?)) +eval $clean_gen32 +popd + +echo; echo "// building ingame_overlay [mini_detour dep x32]" +pushd "deps/mini_detour" +eval $recreate_32 +eval $cmake_gen32 -DBUILD_MINIDETOUR_TESTS=OFF +last_code=$((last_code + $?)) +eval $cmake_build32 --target install +last_code=$((last_code + $?)) +eval $clean_gen32 +popd + +echo; echo "// building ingame_overlay [main lib x32]" eval $recreate_32 eval $cmake_gen32 $ingame_overlay_common_defs last_code=$((last_code + $?)) @@ -377,6 +398,27 @@ eval $cmake_build32 --target install last_code=$((last_code + $?)) eval $clean_gen32 +echo; echo "// building ingame_overlay [System dep x64]" +pushd "deps/System" +eval $recreate_64 +eval $cmake_gen64 -DBUILD_SYSTEMLIB_TESTS=OFF +last_code=$((last_code + $?)) +eval $cmake_build64 --target install +last_code=$((last_code + $?)) +eval $clean_gen64 +popd + +echo; echo "// building ingame_overlay [mini_detour dep x64]" +pushd "deps/mini_detour" +eval $recreate_64 +eval $cmake_gen64 -DBUILD_MINIDETOUR_TESTS=OFF +last_code=$((last_code + $?)) +eval $cmake_build64 --target install +last_code=$((last_code + $?)) +eval $clean_gen64 +popd + +echo; echo "// building ingame_overlay [main lib x64]" eval $recreate_64 eval $cmake_gen64 $ingame_overlay_common_defs last_code=$((last_code + $?)) diff --git a/build_win_deps.bat b/build_win_deps.bat index eb43db23..fa036de5 100644 --- a/build_win_deps.bat +++ b/build_win_deps.bat @@ -417,16 +417,17 @@ echo // building ingame_overlay [mini_detour dep x64] pushd "deps\mini_detour" %recreate_64% %cmake_gen64% -DBUILD_MINIDETOUR_TESTS=OFF -set /a _exit=%errorlevel% +set /a _exit+=%errorlevel% %cmake_build64% --target install set /a _exit+=%errorlevel% %clean_gen64% popd +echo: echo // building ingame_overlay [main lib x64] %recreate_64% %cmake_gen64% %ingame_overlay_common_defs% -set /a _exit=%errorlevel% +set /a _exit+=%errorlevel% %cmake_build64% --target install set /a _exit+=%errorlevel% %clean_gen64% diff --git a/third-party/deps/common b/third-party/deps/common index 9f545d0b..fb36d1b5 160000 --- a/third-party/deps/common +++ b/third-party/deps/common @@ -1 +1 @@ -Subproject commit 9f545d0b46548041c13b17e6ca6faefac107caa7 +Subproject commit fb36d1b59973ca626e25a2bb40081af66df08636 diff --git a/tools/generate_emu_config/package_linux.sh b/tools/generate_emu_config/package_linux.sh index 658414d5..8433dd81 100644 --- a/tools/generate_emu_config/package_linux.sh +++ b/tools/generate_emu_config/package_linux.sh @@ -20,7 +20,7 @@ apt install tar -y || exit 1 mkdir -p "$script_dir/$out_dir" -archive_file="$script_dir/$out_dir/generate_emu_config-linux.tar.gz" +archive_file="$script_dir/$out_dir/generate_emu_config-linux.tar.bz2" [[ -f "$archive_file" ]] && rm -f "$archive_file" pushd "$script_dir/$build_dir"