Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/libretro/libretro-super
Browse files Browse the repository at this point in the history
  • Loading branch information
@inactive123
inactive123 committed Jul 8, 2019
2 parents 0212208 + 09f4252 commit 0fe2e5c
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions recipes/android/cores-android
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC
nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC_JNI Makefile jni
o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC_JNI Makefile jni
openlara libretro-openlara https://github.com/libretro/OpenLara.git master NO GENERIC_JNI Makefile src/platform/libretro/jni
play libretro-play https://github.com/libretro/Play-.git master YES ANDROID_CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DANDROID_PLATFORM=19 -DCMAKE_BUILD_TYPE="Release" --target play_libretro
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC_JNI Makefile jni
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC_JNI Makefile jni
prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_JNI Makefile jni
Expand Down
1 change: 1 addition & 0 deletions recipes/apple/cores-ios-generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENE
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=1
pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_TOOLCHAIN_FILE=../deps/Dependencies/cmake-ios/ios.cmake -DTARGET_IOS=ON -DCMAKE_BUILD_TYPE="Release" --target play_libretro
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC_GL Makefile libretro
Expand Down
1 change: 1 addition & 0 deletions recipes/apple/cores-ios-generic.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ platform ios
PLATFORM ios
CORE_JOB YES
MAKE make
CMAKE cmake
1 change: 1 addition & 0 deletions recipes/apple/cores-ios9-generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES G
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2
nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_TOOLCHAIN_FILE=../deps/Dependencies/cmake-ios/ios.cmake -DTARGET_IOS=ON -DCMAKE_BUILD_TYPE="Release" --target play_libretro
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=1
pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
Expand Down
1 change: 1 addition & 0 deletions recipes/apple/cores-ios9-generic.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ platform ios9
PLATFORM ios9
CORE_JOB YES
MAKE make
CMAKE cmake
1 change: 1 addition & 0 deletions recipes/apple/cores-osx-x64-generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENE
openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_BUILD_TYPE="Release" --target play_libretro
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC_GL Makefile libretro
Expand Down
1 change: 1 addition & 0 deletions recipes/linux/cores-linux-arm7neonhf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES G
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=arm
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=1 HAVE_NEON=1 BUILTIN_GPU=neon
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DUSE_GLES=yes -DCMAKE_BUILD_TYPE="Release" --target play_libretro
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release
Expand Down
1 change: 1 addition & 0 deletions recipes/linux/cores-linux-armhf-generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES G
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=arm
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DUSE_GLES=yes -DCMAKE_BUILD_TYPE="Release" --target play_libretro
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release
Expand Down
2 changes: 1 addition & 1 deletion recipes/linux/cores-linux-x64-generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENE
openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DCMAKE_BUILD_TYPE="Release" --target play_libretro
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_BUILD_TYPE="Release" --target play_libretro
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
Expand Down
1 change: 1 addition & 0 deletions recipes/linux/cores-linux-x86-generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES G
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_BUILD_TYPE="Release" --target play_libretro
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release
Expand Down
2 changes: 1 addition & 1 deletion recipes/windows/cores-windows-x64_seh-generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENE
openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 HAVE_THR_AL=1 platform=windows_msvc2017_desktop_x64
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DCMAKE_BUILD_TYPE="Release" --target play_libretro
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE sln build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_BUILD_TYPE="Release" -G"Visual Studio 15 2017 Win64" --target play_libretro
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
Expand Down
3 changes: 2 additions & 1 deletion recipes/windows/cores-windows-x86_dw2-generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENERIC Makefile .
mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x86
mesen-s libretro-mesen-s https://github.com/SourMesen/Mesen-S.git master YES GENERIC Makefile Libretro
mesen-s libretro-mesen-s https://github.com/SourMesen/Mesen-S.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x86
meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO GENERIC Makefile libretro
mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro .
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
Expand All @@ -82,6 +82,7 @@ openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES G
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86 HAVE_THR_AL=1 platform=windows_msvc2017_desktop_x86
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
play libretro-play https://github.com/libretro/Play-.git master YES CMAKE sln build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DCMAKE_BUILD_TYPE="Release" -G"Visual Studio 15 2017" --target play_libretro
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC_GL Makefile libretro platform=windows_msvc2017_desktop_x86
Expand Down

0 comments on commit 0fe2e5c

Please sign in to comment.