Skip to content

Commit b7d7f69

Browse files
committed
Update submodules
1 parent c94ff68 commit b7d7f69

11 files changed

+12
-11
lines changed
8 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

Assets/dll/libmupen64plus.so

4 KB
Binary file not shown.
0 Bytes
Binary file not shown.
7 KB
Binary file not shown.

Assets/dll/mupen64plus.dll

11 KB
Binary file not shown.

ExternalProjects/mupen64plus/build-all.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,26 @@ cd "$(dirname "$0")"
55
install_to_bizhawk () {
66
if [ "$OS" = "Windows_NT" ]; then
77
path=$1$2.dll
8+
target=$2.dll
89
else
9-
path="$1"lib$2.so
10-
mv "$1$2.so" "$path"
10+
path=$1$2.so
11+
target=lib$2.so
1112
fi
1213
strip -p "$path"
13-
cp "$path" ../../Assets/dll/
14+
cp "$path" ../../Assets/dll/$target
1415
if [ -d ../../output/dll ]; then
15-
cp "$path" ../../output/dll/
16+
cp "$path" ../../output/dll/$target
1617
fi
1718
}
1819

1920
rm -rf mupen64plus-core/projects/unix/_obj
2021
# do we want ACCURATE_FPU=1 here?
2122
make -C mupen64plus-core/projects/unix VULKAN=0 NEW_DYNAREC=1 OSD=0 ACCURATE_FPU=0 KEYBINDINGS=0 DEBUGGER=1 all -j4
2223
if [ "$OS" != "Windows_NT" ]; then
23-
mv mupen64plus-core/projects/unix/libmupen64plus.so.2.0.0 mupen64plus-core/projects/unix/mupen64plus.so
24-
patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so mupen64plus-core/projects/unix/mupen64plus.so
24+
mv mupen64plus-core/projects/unix/libmupen64plus.so.2.0.0 build/mupen64plus.so
25+
patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so build/mupen64plus.so
2526
fi
26-
install_to_bizhawk mupen64plus-core/projects/unix/ mupen64plus
27+
install_to_bizhawk build/ mupen64plus
2728

2829
make -C mupen64plus-audio-bkm install
2930

Submodule mupen64plus-core updated 44 files

0 commit comments

Comments
 (0)