diff --git a/build.sh b/build.sh index 8fb7d70..289b1bc 100755 --- a/build.sh +++ b/build.sh @@ -30,9 +30,9 @@ make NETPLAY=1 NO_ASM=1 OSD=0 V=1 -j4 all cp -P $base_dir/mupen64plus-core/projects/unix/*$suffix* $install_dir cp $base_dir/mupen64plus-core/data/* $install_dir -cd $base_dir/mupen64plus-input-raphnetraw/projects/unix +cd $base_dir/simple64-input-raphnetraw/projects/unix make V=1 -j4 all -cp $base_dir/mupen64plus-input-raphnetraw/projects/unix/*$suffix $install_dir +cp $base_dir/simple64-input-raphnetraw/projects/unix/*$suffix $install_dir mkdir -p $base_dir/simple64-input-qt/build cd $base_dir/simple64-input-qt/build @@ -82,7 +82,7 @@ else cmake -DCMAKE_BUILD_TYPE=Release .. fi VERBOSE=1 cmake --build . -cp mupen64plus-rsp-parallel.* $install_dir +cp simple64-rsp-parallel.* $install_dir mkdir -p $base_dir/parallel-rdp-standalone/build cd $base_dir/parallel-rdp-standalone/build @@ -92,7 +92,7 @@ else cmake -DCMAKE_BUILD_TYPE=Release .. fi VERBOSE=1 cmake --build . -cp mupen64plus-video-parallel.* $install_dir +cp simple64-video-parallel.* $install_dir if [[ $UNAME == *"MINGW"* ]]; then cd $install_dir diff --git a/clean.sh b/clean.sh index cc5d82e..7d90ecd 100755 --- a/clean.sh +++ b/clean.sh @@ -7,7 +7,7 @@ rm -rf mupen64plus-core/projects/unix/_obj rm -rf mupen64plus-core/projects/unix/libmupen64plus.dylib rm -rf simple64-gui/build rm -rf simple64-input-qt/build -rm -rf mupen64plus-input-raphnetraw/projects/unix/_obj -rm -rf mupen64plus-input-raphnetraw/projects/unix/mupen64plus-input-raphnetraw.dylib +rm -rf simple64-input-raphnetraw/projects/unix/_obj +rm -rf simple64-input-raphnetraw/projects/unix/simple64-input-raphnetraw.dylib rm -rf parallel-rsp/build rm -rf parallel-rdp-standalone/build diff --git a/link-mac.sh b/link-mac.sh index 5eed3dc..cb6ac2c 100755 --- a/link-mac.sh +++ b/link-mac.sh @@ -1,18 +1,18 @@ #!/usr/bin/env bash -contents=mupen64plus/mupen64plus-gui.app/Contents +contents=simple64/simple64-gui.app/Contents # Get files in correct directories -mv mupen64plus/font.ttf $contents/MacOS -mv mupen64plus/libmupen64plus.dylib $contents/MacOS -mv mupen64plus/mupen64plus-audio-sdl2.dylib $contents/MacOS -mv mupen64plus/mupen64plus-input-qt.dylib $contents/MacOS -mv mupen64plus/mupen64plus-input-raphnetraw.dylib $contents/MacOS -mv mupen64plus/mupen64plus-rsp-parallel.dylib $contents/MacOS -mv mupen64plus/mupen64plus-video-parallel.dylib $contents/MacOS -mv mupen64plus/mupen64plus.ini $contents/MacOS -mv mupen64plus/mupencheat.txt $contents/MacOS -mv mupen64plus/discord_game_sdk.dylib $contents/MacOS +mv simple64/font.ttf $contents/MacOS +mv simple64/libmupen64plus.dylib $contents/MacOS +mv simple64/simple64-audio-sdl2.dylib $contents/MacOS +mv simple64/simple64-input-qt.dylib $contents/MacOS +mv simple64/simple64-input-raphnetraw.dylib $contents/MacOS +mv simple64/simple64-rsp-parallel.dylib $contents/MacOS +mv simple64/simple64-video-parallel.dylib $contents/MacOS +mv simple64/mupen64plus.ini $contents/MacOS +mv simple64/mupencheat.txt $contents/MacOS +mv simple64/discord_game_sdk.dylib $contents/MacOS # SDL cp /usr/local/opt/sdl2_net/lib/libSDL2-2.0.0.dylib $contents/Frameworks @@ -40,9 +40,9 @@ install_name_tool -change /usr/local/opt/libpng/lib/libpng16.16.dylib @executabl otool -L $contents/Frameworks/libfreetype.6.dylib -# mupen64plus-gui +# simple64-gui # nothing to link -otool -L $contents/MacOS/mupen64plus-gui +otool -L $contents/MacOS/simple64-gui # libmupen64plus.dylib install_name_tool -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib $contents/MacOS/libmupen64plus.dylib @@ -51,31 +51,31 @@ install_name_tool -change /usr/local/opt/libpng/lib/libpng16.16.dylib @executabl otool -L $contents/MacOS/libmupen64plus.dylib -# mupen64plus-audio-sdl2.dylib -install_name_tool -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib $contents/MacOS/mupen64plus-audio-sdl2.dylib +# simple64-audio-sdl2.dylib +install_name_tool -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib $contents/MacOS/simple64-audio-sdl2.dylib -otool -L $contents/MacOS/mupen64plus-audio-sdl2.dylib +otool -L $contents/MacOS/simple64-audio-sdl2.dylib -# mupen64plus-input-qt.dylib -install_name_tool -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib $contents/MacOS/mupen64plus-input-qt.dylib -install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets $contents/MacOS/mupen64plus-input-qt.dylib -install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui $contents/MacOS/mupen64plus-input-qt.dylib -install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore $contents/MacOS/mupen64plus-input-qt.dylib +# simple64-input-qt.dylib +install_name_tool -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib $contents/MacOS/simple64-input-qt.dylib +install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets $contents/MacOS/simple64-input-qt.dylib +install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui $contents/MacOS/simple64-input-qt.dylib +install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore $contents/MacOS/simple64-input-qt.dylib -otool -L $contents/MacOS/mupen64plus-input-qt.dylib +otool -L $contents/MacOS/simple64-input-qt.dylib -# mupen64plus-input-raphnetraw.dylib -install_name_tool -change /usr/local/opt/hidapi/lib/libhidapi.0.dylib @executable_path/../Frameworks/libhidapi.0.dylib $contents/MacOS/mupen64plus-input-raphnetraw.dylib +# simple64-input-raphnetraw.dylib +install_name_tool -change /usr/local/opt/hidapi/lib/libhidapi.0.dylib @executable_path/../Frameworks/libhidapi.0.dylib $contents/MacOS/simple64-input-raphnetraw.dylib -otool -L $contents/MacOS/mupen64plus-input-raphnetraw.dylib +otool -L $contents/MacOS/simple64-input-raphnetraw.dylib -# mupen64plus-rsp-parallel.dylib +# simple64-rsp-parallel.dylib -otool -L $contents/MacOS/mupen64plus-rsp-parallel.dylib +otool -L $contents/MacOS/simple64-rsp-parallel.dylib -# mupen64plus-video-parallel.dylib +# simple64-video-parallel.dylib -otool -L $contents/MacOS/mupen64plus-video-parallel.dylib +otool -L $contents/MacOS/simple64-video-parallel.dylib # Time to create the DMG