Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-01-18 23:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/cooker-0.7.0b' into cooker-0.7.0b-icenine451

Browse source
This commit is contained in:
icenine451 2023-04-20 10:52:20 -04:00
parent 6619191a15 dd6c35352f
commit 7c4b632ac8
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
net.retrodeck.retrodeck.yml
View file

@ -8,13 +8,13 @@ sdk-extensions:
#- org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx - Removed, check if it's not breaking something else #- org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx - Removed, check if it's not breaking something else
base: io.qt.qtwebengine.BaseApp # Needed for Yuzu base: io.qt.qtwebengine.BaseApp # Needed for Yuzu
base-version: 5.15-22.08 # Needed for Yuzu base-version: 5.15-22.08 # Needed for Yuzu
add-extensions: # add-extensions:
org.freedesktop.Platform.ffmpeg-full: # org.freedesktop.Platform.ffmpeg-full:
directory: lib/ffmpeg # directory: lib/ffmpeg
add-ld-path: . # add-ld-path: .
version: '22.08' # version: '22.08'
autodownload: true # autodownload: true
autodelete: false # autodelete: false
command: retrodeck.sh command: retrodeck.sh
finish-args: finish-args:
@ -826,7 +826,8 @@ modules:
- -DUSE_NATIVE_INSTRUCTIONS=OFF - -DUSE_NATIVE_INSTRUCTIONS=OFF
- -DUSE_PRECOMPILED_HEADERS=OFF - -DUSE_PRECOMPILED_HEADERS=OFF
- -DUSE_SYSTEM_CURL=ON - -DUSE_SYSTEM_CURL=ON
- -DUSE_SYSTEM_FFMPEG=ON # Disabled this to force RPCS3 to use our built FFMPEG
- -DUSE_SYSTEM_FFMPEG=OFF
- -DUSE_SYSTEM_LIBPNG=ON - -DUSE_SYSTEM_LIBPNG=ON
- -DUSE_SYSTEM_ZLIB=ON - -DUSE_SYSTEM_ZLIB=ON
- -DITTAPI_SOURCE_DIR=/run/build/rpcs3/ittapi - -DITTAPI_SOURCE_DIR=/run/build/rpcs3/ittapi

2
rd-submodules/retroarch

@ -1 +1 @@
Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 Subproject commit 717b78093797270877ec416e58082f1c71d435d8