From bcc4b58bb263c56e13c6d041faaca0b0b301f0f7 Mon Sep 17 00:00:00 2001 From: Logan Date: Sat, 31 Oct 2020 17:02:03 -0600 Subject: [PATCH] Update for LLE (#86) --- build.sh | 22 +++++++++++++++++++++- clean.sh | 2 +- link-mac.sh | 10 ++++++++++ pull_repos.sh | 10 ++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index dd25ba3..c96fb5d 100755 --- a/build.sh +++ b/build.sh @@ -85,7 +85,7 @@ if [[ $UNAME == *"MINGW"* ]]; then else cmake -DMUPENPLUSAPI_GLIDENUI=On -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/ fi -make -j4 +cmake --build . if [[ $UNAME == *"MINGW"* ]]; then cp mupen64plus-video-GLideN64$suffix $install_dir @@ -94,6 +94,26 @@ else fi cp $base_dir/GLideN64/ini/GLideN64.custom.ini $install_dir +mkdir -p $base_dir/parallel-rsp/build +cd $base_dir/parallel-rsp/build +if [[ $UNAME == *"MINGW"* ]]; then + cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. +else + cmake -DCMAKE_BUILD_TYPE=Release .. +fi +cmake --build . +cp mupen64plus-rsp-parallel.* $install_dir + +mkdir -p $base_dir/angrylion-rdp-plus/build +cd $base_dir/angrylion-rdp-plus/build +if [[ $UNAME == *"MINGW"* ]]; then + cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release .. +else + cmake -DCMAKE_BUILD_TYPE=Release .. +fi +cmake --build . +cp mupen64plus-video-angrylion-plus.* $install_dir + if [[ $UNAME == *"MINGW"* ]]; then cd $install_dir windeployqt.exe mupen64plus-gui.exe diff --git a/clean.sh b/clean.sh index 73bc4ca..4b447d0 100755 --- a/clean.sh +++ b/clean.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -rm -rf mupen64plus mupen64plus-audio-sdl2/projects/unix/_obj mupen64plus-audio-sdl2/projects/unix/mupen64plus-audio-sdl2.dylib mupen64plus-core/projects/unix/_obj/ mupen64plus-core/projects/unix/libmupen64plus.dylib mupen64plus-gui/build mupen64plus-input-qt/build mupen64plus-input-raphnetraw/projects/unix/_obj/ mupen64plus-input-raphnetraw/projects/unix/mupen64plus-input-raphnetraw.dylib mupen64plus-rsp-hle/projects/unix/_obj/ mupen64plus-rsp-hle/projects/unix/mupen64plus-rsp-hle.dylib GLideN64/projects/cmake/CMakeFiles GLideN64/projects/cmake/mupen64plus-video-GLideN64_autogen GLideN64/projects/cmake/osal GLideN64/projects/cmake/cmake_install.cmake GLideN64/projects/cmake/CMakeCache.txt GLideN64/projects/cmake/Makefile +rm -rf mupen64plus mupen64plus-audio-sdl2/projects/unix/_obj mupen64plus-audio-sdl2/projects/unix/mupen64plus-audio-sdl2.dylib mupen64plus-core/projects/unix/_obj/ mupen64plus-core/projects/unix/libmupen64plus.dylib mupen64plus-gui/build mupen64plus-input-qt/build mupen64plus-input-raphnetraw/projects/unix/_obj/ mupen64plus-input-raphnetraw/projects/unix/mupen64plus-input-raphnetraw.dylib mupen64plus-rsp-hle/projects/unix/_obj/ mupen64plus-rsp-hle/projects/unix/mupen64plus-rsp-hle.dylib GLideN64/projects/cmake/CMakeFiles GLideN64/projects/cmake/mupen64plus-video-GLideN64_autogen GLideN64/projects/cmake/osal GLideN64/projects/cmake/cmake_install.cmake GLideN64/projects/cmake/CMakeCache.txt GLideN64/projects/cmake/Makefile parallel-rdp/build angrylion-rdp-plus/build diff --git a/link-mac.sh b/link-mac.sh index c863d1e..9b833f9 100755 --- a/link-mac.sh +++ b/link-mac.sh @@ -11,6 +11,8 @@ mv mupen64plus/mupen64plus-input-qt.dylib $contents/MacOS mv mupen64plus/mupen64plus-input-raphnetraw.dylib $contents/MacOS mv mupen64plus/mupen64plus-rsp-hle.dylib $contents/MacOS mv mupen64plus/mupen64plus-video-GLideN64.dylib $contents/MacOS +mv mupen64plus/mupen64plus-video-angrylion-plus.dylib $contents/MacOS +mv mupen64plus/mupen64plus-rsp-parallel.dylib $conntents/MacOS mv mupen64plus/mupen64plus.ini $contents/MacOS mv mupen64plus/mupencheat.txt $contents/MacOS mv mupen64plus/discord_game_sdk.dylib $contents/MacOS @@ -88,6 +90,14 @@ install_name_tool -change /usr/local/opt/freetype/lib/libfreetype.6.dylib @execu otool -L $contents/MacOS/mupen64plus-video-GLideN64.dylib +# mupen64plus-video-angrylion-plus.dylib + +otool -L $contents/MacOS/mupen64plus-video-angrylion-plus.dylib + +# mupen64plus-rsp-parallel.dylib + +otool -L $contents/MacOS/mupen64plus-rsp-parallel.dylib + # Time to create the DMG # 1. Create symlink to Applications folder diff --git a/pull_repos.sh b/pull_repos.sh index ade249c..1df81f1 100755 --- a/pull_repos.sh +++ b/pull_repos.sh @@ -33,4 +33,14 @@ git fetch mupen64plus-input-raphnetraw git merge -s subtree mupen64plus-input-raphnetraw/sdl2 --allow-unrelated-histories --squash git commit -m "update raphnet" +git remote add parallel-rsp https://github.com/loganmc10/parallel-rsp.git +git fetch parallel-rsp +git merge -s subtree parallel-rsp/master --allow-unrelated-histories --squash +git commit -m "update parallel rsp" + +git remote add angrylion-rdp-plus https://github.com/ata4/angrylion-rdp-plus.git +git fetch angrylion-rdp-plus +git merge -s subtree angrylion-rdp-plus/master --allow-unrelated-histories --squash +git commit -m "update angrylion" + git push origin master