Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-11-23 19:25:35 +08:00
Code Issues 1 Projects Releases Wiki Activity

* point at updated deps submodule

Browse Source 
* fixed mistakes in win deps build script + gen_emu_config package script

* update linux deps build script
This commit is contained in:
otavepto 2024-03-02 16:32:51 +02:00 committed by otavepto
parent 34aa0d9fc3
commit 4bf76af19b
4 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
build_linux_deps.sh
View File

@ -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" 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 $recreate_32
eval $cmake_gen32 $ingame_overlay_common_defs eval $cmake_gen32 $ingame_overlay_common_defs
last_code=$((last_code + $?)) last_code=$((last_code + $?))
@ -377,6 +398,27 @@ eval $cmake_build32 --target install
last_code=$((last_code + $?)) last_code=$((last_code + $?))
eval $clean_gen32 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 $recreate_64
eval $cmake_gen64 $ingame_overlay_common_defs eval $cmake_gen64 $ingame_overlay_common_defs
last_code=$((last_code + $?)) last_code=$((last_code + $?))

5
build_win_deps.bat
View File

@ -417,16 +417,17 @@ echo // building ingame_overlay [mini_detour dep x64]
pushd "deps\mini_detour" pushd "deps\mini_detour"
%recreate_64% %recreate_64%
%cmake_gen64% -DBUILD_MINIDETOUR_TESTS=OFF %cmake_gen64% -DBUILD_MINIDETOUR_TESTS=OFF
set /a _exit=%errorlevel% set /a _exit+=%errorlevel%
%cmake_build64% --target install %cmake_build64% --target install
set /a _exit+=%errorlevel% set /a _exit+=%errorlevel%
%clean_gen64% %clean_gen64%
popd popd
echo:
echo // building ingame_overlay [main lib x64] echo // building ingame_overlay [main lib x64]
%recreate_64% %recreate_64%
%cmake_gen64% %ingame_overlay_common_defs% %cmake_gen64% %ingame_overlay_common_defs%
set /a _exit=%errorlevel% set /a _exit+=%errorlevel%
%cmake_build64% --target install %cmake_build64% --target install
set /a _exit+=%errorlevel% set /a _exit+=%errorlevel%
%clean_gen64% %clean_gen64%

2
third-party/deps/common vendored

@ -1 +1 @@
Subproject commit 9f545d0b46548041c13b17e6ca6faefac107caa7 Subproject commit fb36d1b59973ca626e25a2bb40081af66df08636

2
tools/generate_emu_config/package_linux.sh
View File

@ -20,7 +20,7 @@ apt install tar -y || exit 1
mkdir -p "$script_dir/$out_dir" 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" [[ -f "$archive_file" ]] && rm -f "$archive_file"
pushd "$script_dir/$build_dir" pushd "$script_dir/$build_dir"