From 5585dd4f4651a3678c02eff3edeecd97a2e2d597 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 14 Apr 2022 09:27:49 +0200 Subject: [PATCH 1/4] Removed some unnecessary libraries from the Flatpak manifest file. --- .../assets/org.es_de.emulationstation-de.yml | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/es-app/assets/org.es_de.emulationstation-de.yml b/es-app/assets/org.es_de.emulationstation-de.yml index b30288cad..671420c7c 100644 --- a/es-app/assets/org.es_de.emulationstation-de.yml +++ b/es-app/assets/org.es_de.emulationstation-de.yml @@ -32,45 +32,6 @@ cleanup: - /lib/libvpx.a modules: - - name: libvpx - config-opts: - - --disable-examples - - --disable-docs - - --enable-pic - - --enable-vp9-highbitdepth - sources: - - type: git - url: https://github.com/webmproject/libvpx.git - tag: v1.11.0 - - - name: ogg - buildsystem: cmake - config-opts: - - -DCMAKE_POSITION_INDEPENDENT_CODE=on - - -DINSTALL_DOCS=off - sources: - - type: git - url: https://github.com/xiph/ogg.git - tag: v1.3.5 - - - name: vorbis - buildsystem: cmake - config-opts: - - -DBUILD_SHARED_LIBS=on - sources: - - type: git - url: https://gitlab.xiph.org/xiph/vorbis.git - tag: v1.3.7 - - - name: opus - buildsystem: cmake - config-opts: - - -DBUILD_SHARED_LIBS=on - sources: - - type: git - url: https://gitlab.xiph.org/xiph/opus.git - tag: v1.3.1 - - name: ffmpeg config-opts: - --disable-static From fa0895ed728c9d19f7bfdce25a2b66fe4e1816b6 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 14 Apr 2022 09:41:40 +0200 Subject: [PATCH 2/4] Removed some unnecessary cleanup from the Flatpak manifest file. --- es-app/assets/org.es_de.emulationstation-de.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/es-app/assets/org.es_de.emulationstation-de.yml b/es-app/assets/org.es_de.emulationstation-de.yml index 671420c7c..b6f12ffb7 100644 --- a/es-app/assets/org.es_de.emulationstation-de.yml +++ b/es-app/assets/org.es_de.emulationstation-de.yml @@ -28,8 +28,6 @@ cleanup: - /lib/debug - /lib/pkgconfig - /lib/libfreeimage.a - - /lib/libogg.a - - /lib/libvpx.a modules: - name: ffmpeg From f801538d3ec65863b30c688aa5a5a40a1817888e Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 14 Apr 2022 10:36:42 +0200 Subject: [PATCH 3/4] Removed an implicit directory setting from the Flatpak manifest file. --- es-app/assets/org.es_de.emulationstation-de.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/es-app/assets/org.es_de.emulationstation-de.yml b/es-app/assets/org.es_de.emulationstation-de.yml index b6f12ffb7..1dbd6c37c 100644 --- a/es-app/assets/org.es_de.emulationstation-de.yml +++ b/es-app/assets/org.es_de.emulationstation-de.yml @@ -50,8 +50,6 @@ modules: no-autogen: true build-options: cxxflags: -std=c++14 - make-args: - - DESTDIR=/app sources: - type: archive url: http://downloads.sourceforge.net/freeimage/FreeImage3180.zip From 33c7f2be5ddaa99c2992f9e6134d484d4d2cb1f6 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 14 Apr 2022 10:50:34 +0200 Subject: [PATCH 4/4] (Windows) Added 'Emulators' paths for the portable installation. --- INSTALL-DEV.md | 29 +++++++++++++++++++++ resources/systems/windows/es_find_rules.xml | 26 +++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md index 8b6ab5be3..4a725eee6 100644 --- a/INSTALL-DEV.md +++ b/INSTALL-DEV.md @@ -1527,6 +1527,8 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo %ESPATH%\RetroArch-Win64\retroarch.exe %ESPATH%\RetroArch\retroarch.exe + %ESPATH%\Emulators\RetroArch-Win64\retroarch.exe + %ESPATH%\Emulators\RetroArch\retroarch.exe %ESPATH%\..\RetroArch-Win64\retroarch.exe %ESPATH%\..\RetroArch\retroarch.exe @@ -1548,6 +1550,7 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo C:\Program Files (x86)\PCSX2\pcsx2.exe D:\Program Files (x86)\PCSX2\pcsx2.exe %ESPATH%\PCSX2\pcsx2.exe + %ESPATH%\Emulators\PCSX2\pcsx2.exe %ESPATH%\..\PCSX2\pcsx2.exe @@ -1559,6 +1562,7 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo ~\AppData\Local\yuzu\yuzu-windows-msvc\yuzu.exe %ESPATH%\yuzu\yuzu-windows-msvc\yuzu.exe + %ESPATH%\Emulators\yuzu\yuzu-windows-msvc\yuzu.exe %ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe @@ -1773,6 +1777,31 @@ VBA-M\visualboyadvance-m.exe xemu\xemu.exe xenia\xenia.exe yuzu\yuzu-windows-msvc\yuzu.exe + +Emulators\RetroArch-Win64\retroarch.exe +Emulators\RetroArch\retroarch.exe +Emulators\cemu\Cemu.exe +Emulators\Citra\canary-mingw\citra.exe +Emulators\Citra\nightly-mingw\citra.exe +Emulators\Dolphin-x64\Dolphin.exe +Emulators\dosbox-staging\dosbox.exe +Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe +Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe +Emulators\flycast\flycast.exe +Emulators\mame\mame.exe +Emulators\melonDS\melonDS.exe +Emulators\mGBA\mGBA.exe +Emulators\mupen64plus\mupen64plus-ui-console.exe +Emulators\PCSX2\pcsx2.exe +Emulators\PPSSPP\PPSSPPWindows64.exe +Emulators\redream\redream.exe +Emulators\RPCS3\rpcs3.exe +Emulators\ryujinx\Ryujinx.exe +Emulators\VBA-M\visualboyadvance-m.exe +Emulators\xemu\xemu.exe +Emulators\xenia\xenia.exe +Emulators\yuzu\yuzu-windows-msvc\yuzu.exe + ..\RetroArch-Win64\retroarch.exe ..\RetroArch\retroarch.exe ..\cemu\Cemu.exe diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index 5f7c1ce84..12e5548db 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -27,6 +27,8 @@ %ESPATH%\RetroArch-Win64\retroarch.exe %ESPATH%\RetroArch\retroarch.exe + %ESPATH%\Emulators\RetroArch-Win64\retroarch.exe + %ESPATH%\Emulators\RetroArch\retroarch.exe %ESPATH%\..\RetroArch-Win64\retroarch.exe %ESPATH%\..\RetroArch\retroarch.exe @@ -43,6 +45,7 @@ %ESPATH%\cemu\Cemu.exe + %ESPATH%\Emulators\cemu\Cemu.exe %ESPATH%\..\cemu\Cemu.exe @@ -55,8 +58,10 @@ ~\AppData\Local\Citra\nightly-mingw\citra.exe ~\AppData\Local\Citra\canary-mingw\citra.exe %ESPATH%\Citra\nightly-mingw\citra.exe - %ESPATH%\..\Citra\nightly-mingw\citra.exe %ESPATH%\Citra\canary-mingw\citra.exe + %ESPATH%\Emulators\Citra\nightly-mingw\citra.exe + %ESPATH%\Emulators\Citra\canary-mingw\citra.exe + %ESPATH%\..\Citra\nightly-mingw\citra.exe %ESPATH%\..\Citra\canary-mingw\citra.exe @@ -67,6 +72,7 @@ %ESPATH%\Dolphin-x64\Dolphin.exe + %ESPATH%\Emulators\Dolphin-x64\Dolphin.exe %ESPATH%\..\Dolphin-x64\Dolphin.exe @@ -77,6 +83,7 @@ %ESPATH%\dosbox-staging\dosbox.exe + %ESPATH%\Emulators\dosbox-staging\dosbox.exe %ESPATH%\..\dosbox-staging\dosbox.exe @@ -89,6 +96,8 @@ %ESPATH%\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe %ESPATH%\duckstation\duckstation-qt-x64-ReleaseLTCG.exe + %ESPATH%\Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe + %ESPATH%\Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe %ESPATH%\..\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe %ESPATH%\..\duckstation\duckstation-qt-x64-ReleaseLTCG.exe @@ -100,6 +109,7 @@ %ESPATH%\flycast\flycast.exe + %ESPATH%\Emulators\flycast\flycast.exe %ESPATH%\..\flycast\flycast.exe @@ -110,6 +120,7 @@ %ESPATH%\FS-UAE\Windows\x86-64\fs-uae.exe + %ESPATH%\Emulators\FS-UAE\Windows\x86-64\fs-uae.exe %ESPATH%\..\FS-UAE\Windows\x86-64\fs-uae.exe @@ -120,6 +131,7 @@ %ESPATH%\mame\mame.exe + %ESPATH%\Emulators\mame\mame.exe %ESPATH%\..\mame\mame.exe @@ -130,6 +142,7 @@ %ESPATH%\melonDS\melonDS.exe + %ESPATH%\Emulators\melonDS\melonDS.exe %ESPATH%\..\melonDS\melonDS.exe @@ -145,6 +158,7 @@ C:\Program Files\mGBA\mGBA.exe D:\Program Files\mGBA\mGBA.exe %ESPATH%\mGBA\mGBA.exe + %ESPATH%\Emulators\mGBA\mGBA.exe %ESPATH%\..\mGBA\mGBA.exe @@ -153,6 +167,7 @@ mupen64plus-ui-console.exe %ESPATH%\mupen64plus\mupen64plus-ui-console.exe + %ESPATH%\Emulators\mupen64plus\mupen64plus-ui-console.exe %ESPATH%\..\mupen64plus\mupen64plus-ui-console.exe @@ -168,6 +183,7 @@ C:\Program Files (x86)\PCSX2\pcsx2.exe D:\Program Files (x86)\PCSX2\pcsx2.exe %ESPATH%\PCSX2\pcsx2.exe + %ESPATH%\Emulators\PCSX2\pcsx2.exe %ESPATH%\..\PCSX2\pcsx2.exe @@ -183,6 +199,7 @@ C:\Program Files\PPSSPP\PPSSPPWindows64.exe D:\Program Files\PPSSPP\PPSSPPWindows64.exe %ESPATH%\PPSSPP\PPSSPPWindows64.exe + %ESPATH%\Emulators\PPSSPP\PPSSPPWindows64.exe %ESPATH%\..\PPSSPP\PPSSPPWindows64.exe @@ -193,6 +210,7 @@ %ESPATH%\redream\redream.exe + %ESPATH%\Emulators\redream\redream.exe %ESPATH%\..\redream\redream.exe @@ -203,6 +221,7 @@ %ESPATH%\RPCS3\rpcs3.exe + %ESPATH%\Emulators\RPCS3\rpcs3.exe %ESPATH%\..\RPCS3\rpcs3.exe @@ -213,6 +232,7 @@ %ESPATH%\ryujinx\Ryujinx.exe + %ESPATH%\Emulators\ryujinx\Ryujinx.exe %ESPATH%\..\ryujinx\Ryujinx.exe @@ -223,6 +243,7 @@ %ESPATH%\VBA-M\visualboyadvance-m.exe + %ESPATH%\Emulators\VBA-M\visualboyadvance-m.exe %ESPATH%\..\VBA-M\visualboyadvance-m.exe @@ -233,6 +254,7 @@ %ESPATH%\xemu\xemu.exe + %ESPATH%\Emulators\xemu\xemu.exe %ESPATH%\..\xemu\xemu.exe @@ -243,6 +265,7 @@ %ESPATH%\xenia\xenia.exe + %ESPATH%\Emulators\xenia\xenia.exe %ESPATH%\..\xenia\xenia.exe @@ -254,6 +277,7 @@ ~\AppData\Local\yuzu\yuzu-windows-msvc\yuzu.exe %ESPATH%\yuzu\yuzu-windows-msvc\yuzu.exe + %ESPATH%\Emulators\yuzu\yuzu-windows-msvc\yuzu.exe %ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe