preserve-emulation/simple64
1
0 Fork 0
mirror of https://github.com/simple64/simple64.git synced 2026-11-11 22:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update for LLE (#86)

Browse Source
This commit is contained in:
Logan authored and GitHub committed 2020-10-31 17:02:03 -06:00
1 parent 26c5689268
commit bcc4b58bb2
4 files changed
+42 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.sh
+21 -1
View File
@@ -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
clean.sh
+1 -1
View File
@@ -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
link-mac.sh
+10
View File
@@ -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
pull_repos.sh
+10
View File
@@ -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