diff --git a/.gitattributes b/.gitattributes index f16d898d0..4c7e85073 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -*.sh eol=lf -recipes/** eol=lf -dist/** eol=lf +*.sh eol=lf +recipes/** eol=lf +dist/** eol=lf diff --git a/.github/workflows/core_info_package.yml b/.github/workflows/core_info_package.yml index 922446577..18bc2bb85 100644 --- a/.github/workflows/core_info_package.yml +++ b/.github/workflows/core_info_package.yml @@ -1,27 +1,27 @@ -name: libretro Core Info Package - -on: - # Trigger the workflow on push, but only for the master branch - push: - branches: - - master - watch: # this is a hack that lets repo owners trigger a build by starring - types: [started] - if: github.actor == github.event.repository.owner.login - -jobs: - Assets: - name: Bundle Core Info Files - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - run: cd dist/info && 7z a -mx=9 info.7z * - - name: Upload core info bundle - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: dist/info/info.7z - tag: Latest - asset_name: info.7z - overwrite: true +name: libretro Core Info Package + +on: + # Trigger the workflow on push, but only for the master branch + push: + branches: + - master + watch: # this is a hack that lets repo owners trigger a build by starring + types: [started] + if: github.actor == github.event.repository.owner.login + +jobs: + Assets: + name: Bundle Core Info Files + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - run: cd dist/info && 7z a -mx=9 info.7z * + - name: Upload core info bundle + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: dist/info/info.7z + tag: Latest + asset_name: info.7z + overwrite: true diff --git a/.gitignore b/.gitignore index d0fab8cdb..9ad882a0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -/libretro-*/ -/libretro64-*/ -/retroarch/ -/build-summary.log -/build-revisions/ -/dist/unix/ -/dist/win*/ -/dist/osx*/ -/dist/wiiu -/dist/psl1ght -/log/ -.DS_Store +/libretro-*/ +/libretro64-*/ +/retroarch/ +/build-summary.log +/build-revisions/ +/dist/unix/ +/dist/win*/ +/dist/osx*/ +/dist/wiiu +/dist/psl1ght +/log/ +.DS_Store diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b4f16724..5c0f687a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,18 @@ -stages: - - package - -.package-base: - image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:latest - stage: package - variables: - MEDIA_PATH: .media - script: - - mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME} - - cp -R ./dist/info ${MEDIA_PATH}/${CI_PROJECT_NAME} - artifacts: - paths: - - ${MEDIA_PATH} - expire_in: 1 day - -libretro-package-any: - extends: .package-base +stages: + - package + +.package-base: + image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:latest + stage: package + variables: + MEDIA_PATH: .media + script: + - mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME} + - cp -R ./dist/info ${MEDIA_PATH}/${CI_PROJECT_NAME} + artifacts: + paths: + - ${MEDIA_PATH} + expire_in: 1 day + +libretro-package-any: + extends: .package-base diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 000000000..866f1e137 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 000000000..f67dd21a6 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\C:\\Users\\TimZen\\Source\\Repos\\libretro-super", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/libretro-super/FileContentIndex/5673ccb4-8319-40e8-be6e-ec3aeecc0342.vsidx b/.vs/libretro-super/FileContentIndex/5673ccb4-8319-40e8-be6e-ec3aeecc0342.vsidx new file mode 100644 index 000000000..3c673c0f0 Binary files /dev/null and b/.vs/libretro-super/FileContentIndex/5673ccb4-8319-40e8-be6e-ec3aeecc0342.vsidx differ diff --git a/.vs/libretro-super/v17/.wsuo b/.vs/libretro-super/v17/.wsuo new file mode 100644 index 000000000..45e35b1b9 Binary files /dev/null and b/.vs/libretro-super/v17/.wsuo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 000000000..77629fcb3 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b3363d16..e55c49be1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ -Changes to cores since version 1.6.7 ------------------------------------- -* Atari 800 - Add .atx to allowed file extensions (TSCHAK). -* FB Alpha 2012 CPS2 - Fix CPS Q Sound function that caused bad sound genertion quality when code was optimized. (xianx/twinaphex/bparker). -* Prosystem - corrected Beef Drop database entry for final release version of ROM from game author Ken Siders' website (underball). -* Parallel N64 - Added msvc2013/2015/2017 x86/x64 targets (twinaphex/bparker). -* Parallel N64 - backports from latest sources (AI Shogi 3 should be fixed, audio issues with Pokemon Puzzle League intro should be fixed, etc.) (twinaphex) -* FCEUMM - Added Xbox/Xbox360 build targets (twinaphex/bparker). -* ALL - Added Travis CI build scripts to most cores for various platforms (bparker). +Changes to cores since version 1.6.7 +------------------------------------ +* Atari 800 - Add .atx to allowed file extensions (TSCHAK). +* FB Alpha 2012 CPS2 - Fix CPS Q Sound function that caused bad sound genertion quality when code was optimized. (xianx/twinaphex/bparker). +* Prosystem - corrected Beef Drop database entry for final release version of ROM from game author Ken Siders' website (underball). +* Parallel N64 - Added msvc2013/2015/2017 x86/x64 targets (twinaphex/bparker). +* Parallel N64 - backports from latest sources (AI Shogi 3 should be fixed, audio issues with Pokemon Puzzle League intro should be fixed, etc.) (twinaphex) +* FCEUMM - Added Xbox/Xbox360 build targets (twinaphex/bparker). +* ALL - Added Travis CI build scripts to most cores for various platforms (bparker). diff --git a/COPYING b/COPYING index 55b28c3a0..d7c066ce5 100644 --- a/COPYING +++ b/COPYING @@ -1,21 +1,21 @@ -MIT License - -Copyright (c) 2020 The RetroArch team - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +MIT License + +Copyright (c) 2020 The RetroArch team + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Makefile b/Makefile index 9378cc0b3..b1ce0a381 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ -default: upgrade fetch build - -upgrade: - @./libretro-upgrade.sh - -fetch: - @./libretro-fetch.sh - -build: - @./libretro-build.sh - -install: - @./libretro-install.sh - +default: upgrade fetch build + +upgrade: + @./libretro-upgrade.sh + +fetch: + @./libretro-fetch.sh + +build: + @./libretro-build.sh + +install: + @./libretro-install.sh + .PHONY: default \ No newline at end of file diff --git a/Makefile.bsd b/Makefile.bsd index 1fcfac637..737103f54 100644 --- a/Makefile.bsd +++ b/Makefile.bsd @@ -1,15 +1,15 @@ -default: upgrade fetch build - -upgrade: - @./libretro-upgrade.sh - -fetch: - @./libretro-fetch.sh - -build: - @./libretro-build-bsd.sh - -install: - @./libretro-install.sh - -.PHONY: default +default: upgrade fetch build + +upgrade: + @./libretro-upgrade.sh + +fetch: + @./libretro-fetch.sh + +build: + @./libretro-build-bsd.sh + +install: + @./libretro-install.sh + +.PHONY: default diff --git a/Makefile.libnx b/Makefile.libnx index 9b0e436e6..a0145ab18 100644 --- a/Makefile.libnx +++ b/Makefile.libnx @@ -1,12 +1,12 @@ -default: upgrade fetch build - -upgrade: - @./libretro-upgrade.sh - -fetch: - @./libretro-fetch.sh $(echo "retroarch"; grep -Eo '^[^ ]+' ./recipes/nintendo/libnx) - -build: - @platform=libnx ./libretro-build.sh $(grep -Eo '^[^ ]+' ./recipes/nintendo/libnx) - -.PHONY: default +default: upgrade fetch build + +upgrade: + @./libretro-upgrade.sh + +fetch: + @./libretro-fetch.sh $(echo "retroarch"; grep -Eo '^[^ ]+' ./recipes/nintendo/libnx) + +build: + @platform=libnx ./libretro-build.sh $(grep -Eo '^[^ ]+' ./recipes/nintendo/libnx) + +.PHONY: default diff --git a/README.md b/README.md index 461c68e8e..e6f90cffc 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ -# Libretro Super Repository - -Fetch, build and install a number of [libretro](http://www.libretro.com/) projects. - -## Dependencies - -See the [Compilation](https://github.com/libretro/RetroArch/wiki#compilation) notes for prerequisites. - -## Usage - -### Download and Build - - make - -### Install - - make install +# Libretro Super Repository + +Fetch, build and install a number of [libretro](http://www.libretro.com/) projects. + +## Dependencies + +See the [Compilation](https://github.com/libretro/RetroArch/wiki#compilation) notes for prerequisites. + +## Usage + +### Download and Build + + make + +### Install + + make install diff --git a/cmake/blackberry.cmake b/cmake/blackberry.cmake index f1e9d585f..81f336a7c 100644 --- a/cmake/blackberry.cmake +++ b/cmake/blackberry.cmake @@ -1,13 +1,13 @@ -set(CMAKE_C_COMPILER "qcc") -# -D_SSIZE_T_DEFINED is only for minizip dependency of TIC-80 -set(CMAKE_C_FLAGS "-V4.8.3,gcc_ntoarmv7le_gpp -std=gnu99 -D_SSIZE_T_DEFINED") -set(CMAKE_CXX_COMPILER "QCC") -set(CMAKE_CXX_FLAGS "-V4.8.3,gcc_ntoarmv7le_gpp -std=gnu++11") -set(CMAKE_AR "arm-unknown-nto-qnx8.0.0eabi-ar") - -set(CMAKE_RANLIB "arm-unknown-nto-qnx8.0.0eabi-ranlib") -set(CMAKE_SYSTEM_PROCESSOR arm) -set(CMAKE_SYSTEM_NAME QNX) -set(CMAKE_CROSSCOMPILING ON) -set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-fPIC") -set(CMAKE_C_LINK_FLAGS "-fPIC") +set(CMAKE_C_COMPILER "qcc") +# -D_SSIZE_T_DEFINED is only for minizip dependency of TIC-80 +set(CMAKE_C_FLAGS "-V4.8.3,gcc_ntoarmv7le_gpp -std=gnu99 -D_SSIZE_T_DEFINED") +set(CMAKE_CXX_COMPILER "QCC") +set(CMAKE_CXX_FLAGS "-V4.8.3,gcc_ntoarmv7le_gpp -std=gnu++11") +set(CMAKE_AR "arm-unknown-nto-qnx8.0.0eabi-ar") + +set(CMAKE_RANLIB "arm-unknown-nto-qnx8.0.0eabi-ranlib") +set(CMAKE_SYSTEM_PROCESSOR arm) +set(CMAKE_SYSTEM_NAME QNX) +set(CMAKE_CROSSCOMPILING ON) +set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-fPIC") +set(CMAKE_C_LINK_FLAGS "-fPIC") diff --git a/cmake/ctr.cmake b/cmake/ctr.cmake index 9869f093e..63dd8c9aa 100644 --- a/cmake/ctr.cmake +++ b/cmake/ctr.cmake @@ -1,26 +1,26 @@ -set(CMAKE_C_COMPILER "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc") -set(CMAKE_CXX_COMPILER "$ENV{DEVKITARM}/bin/arm-none-eabi-g++") -set(CMAKE_AR "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc-ar") - -# Workaround for old cmake. Remove when we update cmake -set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc ") -set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc ") -set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") -set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") - -set(CMAKE_RANLIB "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc-ranlib") -set(CMAKE_SYSTEM_PROCESSOR armv6k) -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_CROSSCOMPILING ON) -set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-fPIC") -set(CMAKE_C_LINK_FLAGS "-fPIC") -set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) -set(CMAKE_CXX_FLAGS " -march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include") -set(CMAKE_C_FLAGS " -march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include") - -add_definitions(-DARM11 -D_3DS) - -# Workaround for old cmake. Remove when we update cmake -add_definitions(-march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include) - -set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" ) +set(CMAKE_C_COMPILER "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc") +set(CMAKE_CXX_COMPILER "$ENV{DEVKITARM}/bin/arm-none-eabi-g++") +set(CMAKE_AR "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc-ar") + +# Workaround for old cmake. Remove when we update cmake +set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc ") +set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc ") +set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") +set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") + +set(CMAKE_RANLIB "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc-ranlib") +set(CMAKE_SYSTEM_PROCESSOR armv6k) +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_CROSSCOMPILING ON) +set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-fPIC") +set(CMAKE_C_LINK_FLAGS "-fPIC") +set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) +set(CMAKE_CXX_FLAGS " -march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include") +set(CMAKE_C_FLAGS " -march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include") + +add_definitions(-DARM11 -D_3DS) + +# Workaround for old cmake. Remove when we update cmake +add_definitions(-march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include) + +set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" ) diff --git a/cmake/libnx.cmake b/cmake/libnx.cmake index 7aa57555d..93698e5e3 100644 --- a/cmake/libnx.cmake +++ b/cmake/libnx.cmake @@ -1,66 +1,66 @@ -# Copied from https://github.com/vbe0201/switch-cmake/blob/master/devkita64-libnx.cmake -# Copyright (c) 2019 SwitchPy Team -# Licensed under MIT license, full text is available in COPYING -if (NOT DEFINED ENV{DEVKITPRO}) - cmake_panic("Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") -endif () - -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_SYSTEM_PROCESSOR aarch64) -set(SWITCH TRUE) # To be used for multiplatform projects - -# devkitPro paths are broken on Windows. We need to use this macro to fix those. -macro(msys_to_cmake_path msys_path resulting_path) - if (WIN32) - string(REGEX REPLACE "^/([a-zA-Z])/" "\\1:/" ${resulting_path} ${msys_path}) - else () - set(${resulting_path} ${msys_path}) - endif () -endmacro() - -msys_to_cmake_path($ENV{DEVKITPRO} DEVKITPRO) -set(DEVKITA64 ${DEVKITPRO}/devkitA64) -set(LIBNX ${DEVKITPRO}/libnx) -set(PORTLIBS_PATH ${DEVKITPRO}/portlibs) -set(PORTLIBS ${PORTLIBS_PATH}/switch) - -set(TOOLCHAIN_PREFIX ${DEVKITA64}/bin/aarch64-none-elf-) -if (WIN32) - set(TOOLCHAIN_SUFFIX ".exe") -else () - set(TOOLCHAIN_SUFFIX "") -endif () - -set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc${TOOLCHAIN_SUFFIX}) -set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++${TOOLCHAIN_SUFFIX}) -set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}as${TOOLCHAIN_SUFFIX}) - -set(PKG_CONFIG_EXECUTABLE ${TOOLCHAIN_PREFIX}pkg-config${TOOLCHAIN_SUFFIX}) -set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar${TOOLCHAIN_SUFFIX} CACHE STRING "") -set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib${TOOLCHAIN_SUFFIX} CACHE STRING "") -set(CMAKE_LD "/${TOOLCHAIN_PREFIX}ld${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "") -set(CMAKE_OBJCOPY "${TOOLCHAIN_PREFIX}objcopy${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "") -set(CMAKE_SIZE_UTIL "${TOOLCHAIN_PREFIX}size${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "") - -set(WITH_PORTLIBS ON CACHE BOOL "use portlibs ?") -if (WITH_PORTLIBS) - set(CMAKE_FIND_ROOT_PATH ${DEVKITA64} ${DEVKITPRO} ${LIBNX} ${PORTLIBS}) -else () - set(CMAKE_FIND_ROOT_PATH ${DEVKITA64} ${DEVKITPRO} ${LIBNX}) -endif () - -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) - -add_definitions(-D__SWITCH__) -set(ARCH "-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MMD -MP -g -Wall -O2 -ffunction-sections ${ARCH}") -set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions") -set(CMAKE_EXE_LINKER_FLAGS_INIT "${ARCH} -ftls-model=local-exec -L${LIBNX}/lib -L${PORTLIBS}/lib") -set(CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) - -set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available") -set(CMAKE_INSTALL_PREFIX ${PORTLIBS}) -set(CMAKE_PREFIX_PATH ${PORTLIBS}) +# Copied from https://github.com/vbe0201/switch-cmake/blob/master/devkita64-libnx.cmake +# Copyright (c) 2019 SwitchPy Team +# Licensed under MIT license, full text is available in COPYING +if (NOT DEFINED ENV{DEVKITPRO}) + cmake_panic("Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") +endif () + +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_SYSTEM_PROCESSOR aarch64) +set(SWITCH TRUE) # To be used for multiplatform projects + +# devkitPro paths are broken on Windows. We need to use this macro to fix those. +macro(msys_to_cmake_path msys_path resulting_path) + if (WIN32) + string(REGEX REPLACE "^/([a-zA-Z])/" "\\1:/" ${resulting_path} ${msys_path}) + else () + set(${resulting_path} ${msys_path}) + endif () +endmacro() + +msys_to_cmake_path($ENV{DEVKITPRO} DEVKITPRO) +set(DEVKITA64 ${DEVKITPRO}/devkitA64) +set(LIBNX ${DEVKITPRO}/libnx) +set(PORTLIBS_PATH ${DEVKITPRO}/portlibs) +set(PORTLIBS ${PORTLIBS_PATH}/switch) + +set(TOOLCHAIN_PREFIX ${DEVKITA64}/bin/aarch64-none-elf-) +if (WIN32) + set(TOOLCHAIN_SUFFIX ".exe") +else () + set(TOOLCHAIN_SUFFIX "") +endif () + +set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc${TOOLCHAIN_SUFFIX}) +set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++${TOOLCHAIN_SUFFIX}) +set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}as${TOOLCHAIN_SUFFIX}) + +set(PKG_CONFIG_EXECUTABLE ${TOOLCHAIN_PREFIX}pkg-config${TOOLCHAIN_SUFFIX}) +set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar${TOOLCHAIN_SUFFIX} CACHE STRING "") +set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib${TOOLCHAIN_SUFFIX} CACHE STRING "") +set(CMAKE_LD "/${TOOLCHAIN_PREFIX}ld${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "") +set(CMAKE_OBJCOPY "${TOOLCHAIN_PREFIX}objcopy${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "") +set(CMAKE_SIZE_UTIL "${TOOLCHAIN_PREFIX}size${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "") + +set(WITH_PORTLIBS ON CACHE BOOL "use portlibs ?") +if (WITH_PORTLIBS) + set(CMAKE_FIND_ROOT_PATH ${DEVKITA64} ${DEVKITPRO} ${LIBNX} ${PORTLIBS}) +else () + set(CMAKE_FIND_ROOT_PATH ${DEVKITA64} ${DEVKITPRO} ${LIBNX}) +endif () + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + +add_definitions(-D__SWITCH__) +set(ARCH "-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MMD -MP -g -Wall -O2 -ffunction-sections ${ARCH}") +set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions") +set(CMAKE_EXE_LINKER_FLAGS_INIT "${ARCH} -ftls-model=local-exec -L${LIBNX}/lib -L${PORTLIBS}/lib") +set(CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) + +set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available") +set(CMAKE_INSTALL_PREFIX ${PORTLIBS}) +set(CMAKE_PREFIX_PATH ${PORTLIBS}) diff --git a/cmake/psp1.cmake b/cmake/psp1.cmake index 0755c2176..a27c3036f 100644 --- a/cmake/psp1.cmake +++ b/cmake/psp1.cmake @@ -1,30 +1,30 @@ -set(CMAKE_C_COMPILER "psp-gcc") -set(CMAKE_CXX_COMPILER "psp-g++") -set(CMAKE_AR "psp-ar") - -# Workaround for old cmake. Remove when we update cmake -set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc ") -set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc ") -set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") -set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") - -set(CMAKE_RANLIB "psp-ranlib") -set(CMAKE_SYSTEM_PROCESSOR mipsel) -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_CROSSCOMPILING ON) -set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") -set(CMAKE_C_LINK_FLAGS "") -set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) - -execute_process(COMMAND psp-config --pspsdk-path OUTPUT_VARIABLE PSPSDK_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) - -set(CMAKE_CXX_FLAGS " -I${PSPSDK_PATH}/include -G0 -Wcast-align") -set(CMAKE_C_FLAGS " -I${PSPSDK_PATH}/include -G0 -Wcast-align") - -add_definitions(-DPSP) - -# Workaround for old cmake. Remove when we update cmake -add_definitions(-I${PSPSDK_PATH}/include -G0 -Wcast-align) - -set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" ) -set(CMAKE_POSITION_INDEPENDENT_CODE OFF) +set(CMAKE_C_COMPILER "psp-gcc") +set(CMAKE_CXX_COMPILER "psp-g++") +set(CMAKE_AR "psp-ar") + +# Workaround for old cmake. Remove when we update cmake +set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc ") +set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc ") +set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") +set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") + +set(CMAKE_RANLIB "psp-ranlib") +set(CMAKE_SYSTEM_PROCESSOR mipsel) +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_CROSSCOMPILING ON) +set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") +set(CMAKE_C_LINK_FLAGS "") +set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) + +execute_process(COMMAND psp-config --pspsdk-path OUTPUT_VARIABLE PSPSDK_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) + +set(CMAKE_CXX_FLAGS " -I${PSPSDK_PATH}/include -G0 -Wcast-align") +set(CMAKE_C_FLAGS " -I${PSPSDK_PATH}/include -G0 -Wcast-align") + +add_definitions(-DPSP) + +# Workaround for old cmake. Remove when we update cmake +add_definitions(-I${PSPSDK_PATH}/include -G0 -Wcast-align) + +set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" ) +set(CMAKE_POSITION_INDEPENDENT_CODE OFF) diff --git a/cmake/vita.cmake b/cmake/vita.cmake index 196bff951..050ae4a2c 100644 --- a/cmake/vita.cmake +++ b/cmake/vita.cmake @@ -1,21 +1,21 @@ -set(CMAKE_C_COMPILER "arm-vita-eabi-gcc") -set(CMAKE_CXX_COMPILER "arm-vita-eabi-g++") -set(CMAKE_AR "arm-vita-eabi-ar") - -# Workaround for old cmake. Remove when we update cmake -set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc ") -set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc ") -set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") -set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") - -set(CMAKE_RANLIB "arm-vita-eabi-ranlib") -set(CMAKE_SYSTEM_PROCESSOR arm) -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_CROSSCOMPILING ON) -set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") -set(CMAKE_C_LINK_FLAGS "") -set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) - -add_definitions(-DVITA -D_VITA) -set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" ) -set(CMAKE_POSITION_INDEPENDENT_CODE OFF) +set(CMAKE_C_COMPILER "arm-vita-eabi-gcc") +set(CMAKE_CXX_COMPILER "arm-vita-eabi-g++") +set(CMAKE_AR "arm-vita-eabi-ar") + +# Workaround for old cmake. Remove when we update cmake +set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc ") +set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc ") +set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") +set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc ") + +set(CMAKE_RANLIB "arm-vita-eabi-ranlib") +set(CMAKE_SYSTEM_PROCESSOR arm) +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_CROSSCOMPILING ON) +set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") +set(CMAKE_C_LINK_FLAGS "") +set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) + +add_definitions(-DVITA -D_VITA) +set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" ) +set(CMAKE_POSITION_INDEPENDENT_CODE OFF) diff --git a/comptable.py b/comptable.py index fb2652468..7cfe733ae 100755 --- a/comptable.py +++ b/comptable.py @@ -1,300 +1,300 @@ -#!/usr/bin/env python3 - -# License: MIT -# Copyright (C) Google -# Author: Vladimit 'phcoder' Serbinenko - -import os -import csv -import requests - -hostname = 'git.libretro.com' -namespace = 'libretro' - -MISSING = 'missing' -OK = 'OK' -BROKEN = 'broken' - -coremap = {} -allcores = set() -allplatformset = set() -corestatus = {} -corereason = {} - -SUBCORE_SUFFIXES = [ - "plus", - - # bsnes - "accuracy", "balanced", - - # Beetle PSX - "hw", - - # Quake - "rogue", "xatrix", "zaero", - - # VICE - "xpet", "xplus4", "xscpu64", "xvic", "x128", "x64sc", "xcbm2", "xcbm5x0", - - # Boom3 - "xp", - - # MAME - "cdi2015" -] -GFX_FEATS = ['gfxaccel', 'gl1', 'gl2', 'gl3', 'gles2', 'gles3'] -CPU_FEATS = ['x86_any', 'libco', 'cpu64', 'threads', 'thread-local', 'jit', 'little_endian'] -PERIPHERAL_FEATS = ['cdrom', 'usb'] -LANG_FEATS = ['c++14', 'c++11'] -MISC_FEATS = ['physfs', 'jvm'] -ALL_FEATS = GFX_FEATS + CPU_FEATS + PERIPHERAL_FEATS + MISC_FEATS + LANG_FEATS -DESKTOP_COMMON = list(set(ALL_FEATS) - set(['gles2', 'gles3', 'cpu64', 'x86_any', 'little_endian'])) -DESKTOP_X64 = DESKTOP_COMMON + ['x86_any', 'cpu64', 'little_endian'] -DESKTOP_X86 = DESKTOP_COMMON + ['x86_any', 'little_endian'] -DESKTOP_X64_NO_CXX11 = list(set(DESKTOP_X64) - set(['c++14', 'c++11'])) -DESKTOP_X86_NO_CXX11 = list(set(DESKTOP_X86) - set(['c++14', 'c++11'])) -DESKTOP_ARM32LE = DESKTOP_COMMON + ['little_endian'] -DESKTOP_PPC = DESKTOP_COMMON -UWP = ['gfxaccel', 'gles2', 'threads', 'thread-local', 'libco'] + ['cdrom', 'usb', 'physfs', 'c++14', 'c++11', 'jvm'] # unsure about second part -MOBILE_LE = ['gfxaccel', 'gles2', 'gles3', 'threads', 'libco', 'little_endian'] -ANDROID = MOBILE_LE + ['jit', 'physfs', 'thread-local', 'c++14', 'c++11', 'jvm'] -features_platforms = { - # Misc - 'emscripten': ['gfxaccel', 'gles2', 'little_endian', 'physfs', 'c++14', 'c++11'], - - # consoles - 'ctr': ['threads', 'thread-local', 'libco', 'jit', 'little_endian', 'c++14', 'c++11'], - 'psl1ght': ['cpu64'] + ['libco', 'cdrom', 'usb', 'jit', 'c++14', 'c++11'], # unsure about second part - 'ngc': ['threads', 'thread-local', 'libco'] + ['cdrom', 'jit', 'c++14', 'c++11'], # unsure about second part - 'wii': ['threads', 'thread-local', 'libco'] + ['cdrom', 'usb', 'jit', 'c++14', 'c++11'], # unsure about second part - 'ps2': ['little_endian'] + ['libco', 'cpu64', 'threads', 'thread-local', 'cdrom', 'usb', 'jit', 'c++14', 'c++11'], # unsure about second part - 'ps3': ['threads', 'thread-local', 'cpu64'] + ['libco', 'cdrom', 'usb', 'jit', 'c++14', 'c++11'], # unsure about second part - 'psp': ['libco', 'threads', 'thread-local', 'little_endian'] + ['jit', 'c++14', 'c++11'], # unsure about second part - 'libnx-aarch64': ['gfxaccel', 'gl1', 'gl2', 'gl3', 'libco', 'cpu64', 'threads', 'thread-local', 'jit', 'little_endian'] + ['usb', 'c++14', 'c++11'], # unsure about second part - 'wiiu': ['libco'] + ['cdrom', 'usb', 'jit', 'c++14', 'c++11'] + ['threads'], # unsure about second part. Threads are present in OS but not in rthreads yet - 'vita': ['gfxaccel', 'gl1', 'gl2', 'threads', 'thread-local', 'libco', 'jit', 'little_endian', 'c++14', 'c++11'], # 'gl3', 'gles2', 'gles3'? - - # UWP - 'windows-uwp-arm': UWP + ['little_endian'], - 'windows-uwp-x64': UWP + ['x86_any', 'cpu64', 'little_endian'], - 'windows-uwp-x86': UWP + ['x86_any', 'little_endian'], - - # Mobile - 'android-arm64-v8a': ANDROID + ['cpu64'], - 'android-armeabi-v7a': ANDROID, - 'android-x86': ANDROID + ['x86_any'], - 'android-x86_64': ANDROID + ['x86_any', 'cpu64'], - 'ios': MOBILE_LE + ['physfs', 'c++14', 'c++11'], - 'ios9': MOBILE_LE + ['physfs', 'c++14', 'c++11'], - 'ios-arm64': MOBILE_LE + ['cpu64', 'physfs', 'thread-local', 'c++14', 'c++11'], - 'tvos-arm64': MOBILE_LE + ['cpu64', 'physfs', 'thread-local', 'c++14', 'c++11'], - 'qnx': MOBILE_LE + ['physfs', 'thread-local', 'c++14', 'c++11', 'jvm'], # Unsure about usb and thread-local - - # Desktop - 'linux-x64': DESKTOP_X64, - 'windows-x64': DESKTOP_X64, - 'osx-x64': DESKTOP_X64, - 'linux-i686': DESKTOP_X86, - 'windows-i686': DESKTOP_X86, - 'linux-arm7neonhf': DESKTOP_ARM32LE, - 'linux-armhf': DESKTOP_ARM32LE, - 'xbox-x86': DESKTOP_X86, - 'windows-msvc05-i686': DESKTOP_X86_NO_CXX11, - 'windows-msvc10-i686': DESKTOP_X86_NO_CXX11, - 'windows-msvc10-x64': DESKTOP_X64_NO_CXX11, - 'osx-ppc': [x for x in DESKTOP_PPC if x != 'c++14' and x != 'c++11'] -} -features_cores = { - '3dengine': ['gl2'], # Should be gl2 or gles2 but current bugs prevent operating with gles2 - 'atari800': ['libco'], - 'blastem': ['x86_any'], - 'boom3': ['gl1'], - 'boom3-xp': ['gl1'], - 'bsnes': ['libco'], - 'bsnes2014': ['libco'], - 'bsnes-libretro-cplusplus98': ['libco'], - 'bsnes-hd': ['libco'], - 'bsnes-mercury': ['libco'], - 'chailove': ['physfs', 'thread-local', 'threads'], - 'citra': ['gfxaccel'], - 'citra2018': ['gfxaccel'], - 'Craft': ['gfxaccel'], - 'chailove': ['c++14'], - 'dolphin': ['cpu64', 'jit'], - 'dosbox-svn': ['libco'], - 'dosbox-core': ['threads'], - 'dosbox-pure': ['c++11', 'threads'], - 'ffmpeg': ['threads'], - 'flycast': ['gfxaccel'], - 'flycast-upstream': ['gfxaccel'], - 'frodo': ['libco'], - 'hatari': ['libco'], - 'gpsp': ['libco'], - 'ishiiruka': ['cpu64'], - 'kronos': ['gl3'], - 'mupen64plus': ['gfxaccel', 'libco'], - 'neocd': ['c++11'], - 'Omicron': ['gfxaccel', 'jvm'], - 'OpenLara': ['gfxaccel'], - 'parallel-n64': ['gfxaccel', 'libco'], - 'pcem': ['threads'], - 'play': ['gfxaccel'], - 'redbook': ['cdrom'], - 'remotejoy': ['usb'], - 'retro8': ['c++11'], - 'REminiscence': ['libco'], - 'scummvm': ['libco'], - 'ThePowderToy': ['threads'], - 'tic80': ['little_endian'], - 'uae': ['threads'], - 'vitaquake3': ['gl1'], - 'vitavoyager': ['gl1'], - 'yabasanshiro': ['gfxaccel'] -} - -def strip_suffix(s, suffix): - if s.endswith(suffix): - return s[:-len(suffix)] - return s - -def strip_suffixes(s, suffixes): - r = s - for suffix in suffixes + suffixes + suffixes: - r = strip_suffix(r, suffix) - return r - - -def strip_prefix(s, prefix): - if s.startswith(prefix): - return s[len(prefix):] - return s - -def strip_prefixes(s, prefixes): - r = s - for prefix in prefixes: - r = strip_prefix(r, prefix) - return r - -def file_to_platform(fname): - s = strip_suffixes(fname, [ - "-legacy", "-mingw", - - # Mupen64 - "-gles2", "-gles3", - ] + ["-" + x for x in SUBCORE_SUFFIXES]) - s = strip_prefixes(s, ["libretro-", "build-", "static-", - "retroarch-", "dummy-", "deps:", "test:"]) -# for infix in ["msvc05", "msvc10"]: -# s = s.replace("-" + infix + "-", "-") - mp = { - 'code_quality': None, - 'ios-9': 'ios9', - 'trigger_static-cores': None, - "android": None, - 'osx': None, - 'switch': None - } - if s in mp: - s = mp[s] - subcore = list(filter(lambda x: "-" + x + "-" in fname - or fname.endswith("-" + x), SUBCORE_SUFFIXES)) - return (s, "-".join(subcore)) - -def repo_to_core(repname): - s = strip_suffixes(repname, ["-nx", "-libretro", "_libretro"]) - s = strip_prefixes(s, ["libretro-"]) - return s - -def page_get(base): - per_page = 20 - res = [] - for page in range(1, 30): - add = requests.get(base + ('per_page=%d&page=%d' % (per_page, page))).json() - res += add - if len(add) != per_page: - return res - return res - -def parse_pipelines(projectid, sha): - pipelines = requests.get('https://%s/api/v4/projects/%d/pipelines?sha=%s&per_page=20' % (hostname, projectid, sha)).json() - for pipeline in pipelines: - if pipeline['status'] == 'success': -# print(pipeline) - return page_get('https://%s/api/v4/projects/%d/pipelines/%d/jobs?' % (hostname, projectid, pipeline['id'])) - return None - -projects_all = page_get('https://%s/api/v4/projects?simple=true&' % hostname) - -projects = list(filter(lambda x: x['namespace']['path'] == namespace, projects_all)) - -for project in projects: - print(project['path_with_namespace']) - projectid = project['id'] - core_base = repo_to_core(project['path']) - if core_base == 'RetroArch': - continue - commits = requests.get('https://%s/api/v4/projects/%d/repository/commits?ref_name=%s' % (hostname, projectid, project['default_branch'])).json() -# print(commits[0]) - jobs = None - for commit in commits: - jobs = parse_pipelines(projectid, commit['id']) - if jobs is not None: - break - if jobs is None: - jobs = [] - if not jobs: - allcores.add(core_base) - for job in jobs: -# print(job) - (platform, subcore) = file_to_platform(job['name']) - if platform is None: - continue - if subcore: - core = core_base + "-" + subcore - else: - core = core_base - allplatformset.add(platform) - allcores.add(core) - k = (platform, core) - if k not in coremap: - coremap[k] = [] - coremap[k].append({'status': job['status']}) - - -allplatforms = sorted(allplatformset) -cf = open ("comptable.csv", "w") -c = csv.writer(cf) - -c.writerow([""] + allplatforms) - -for core in allcores: - row = [core] - for platform in allplatforms: - k = (platform, core) - if k not in coremap: - status = MISSING - else: - status = OK if any(map(lambda x: x['status'], coremap[k])) else BROKEN - corestatus[k] = status - if core in features_cores and platform in features_platforms: - missing = set(features_cores[core]) - set(features_platforms[platform]) - if missing: - corereason[k] = ','.join(missing) - - -for core in sorted (allcores): - if core in ('dosbox-libretro',): - continue - row = [core] - for platform in allplatforms: - k = (platform, core) - st = corestatus[k] - s = st - if st != OK and k in corereason: - s += " (" + corereason[k] + ")" - if st == OK and k in corereason: - print("%s is enabled on %s despite %s" % (core, platform, corereason[k])) - row += [s] - c.writerow(row) - -cf.close() +#!/usr/bin/env python3 + +# License: MIT +# Copyright (C) Google +# Author: Vladimit 'phcoder' Serbinenko + +import os +import csv +import requests + +hostname = 'git.libretro.com' +namespace = 'libretro' + +MISSING = 'missing' +OK = 'OK' +BROKEN = 'broken' + +coremap = {} +allcores = set() +allplatformset = set() +corestatus = {} +corereason = {} + +SUBCORE_SUFFIXES = [ + "plus", + + # bsnes + "accuracy", "balanced", + + # Beetle PSX + "hw", + + # Quake + "rogue", "xatrix", "zaero", + + # VICE + "xpet", "xplus4", "xscpu64", "xvic", "x128", "x64sc", "xcbm2", "xcbm5x0", + + # Boom3 + "xp", + + # MAME + "cdi2015" +] +GFX_FEATS = ['gfxaccel', 'gl1', 'gl2', 'gl3', 'gles2', 'gles3'] +CPU_FEATS = ['x86_any', 'libco', 'cpu64', 'threads', 'thread-local', 'jit', 'little_endian'] +PERIPHERAL_FEATS = ['cdrom', 'usb'] +LANG_FEATS = ['c++14', 'c++11'] +MISC_FEATS = ['physfs', 'jvm'] +ALL_FEATS = GFX_FEATS + CPU_FEATS + PERIPHERAL_FEATS + MISC_FEATS + LANG_FEATS +DESKTOP_COMMON = list(set(ALL_FEATS) - set(['gles2', 'gles3', 'cpu64', 'x86_any', 'little_endian'])) +DESKTOP_X64 = DESKTOP_COMMON + ['x86_any', 'cpu64', 'little_endian'] +DESKTOP_X86 = DESKTOP_COMMON + ['x86_any', 'little_endian'] +DESKTOP_X64_NO_CXX11 = list(set(DESKTOP_X64) - set(['c++14', 'c++11'])) +DESKTOP_X86_NO_CXX11 = list(set(DESKTOP_X86) - set(['c++14', 'c++11'])) +DESKTOP_ARM32LE = DESKTOP_COMMON + ['little_endian'] +DESKTOP_PPC = DESKTOP_COMMON +UWP = ['gfxaccel', 'gles2', 'threads', 'thread-local', 'libco'] + ['cdrom', 'usb', 'physfs', 'c++14', 'c++11', 'jvm'] # unsure about second part +MOBILE_LE = ['gfxaccel', 'gles2', 'gles3', 'threads', 'libco', 'little_endian'] +ANDROID = MOBILE_LE + ['jit', 'physfs', 'thread-local', 'c++14', 'c++11', 'jvm'] +features_platforms = { + # Misc + 'emscripten': ['gfxaccel', 'gles2', 'little_endian', 'physfs', 'c++14', 'c++11'], + + # consoles + 'ctr': ['threads', 'thread-local', 'libco', 'jit', 'little_endian', 'c++14', 'c++11'], + 'psl1ght': ['cpu64'] + ['libco', 'cdrom', 'usb', 'jit', 'c++14', 'c++11'], # unsure about second part + 'ngc': ['threads', 'thread-local', 'libco'] + ['cdrom', 'jit', 'c++14', 'c++11'], # unsure about second part + 'wii': ['threads', 'thread-local', 'libco'] + ['cdrom', 'usb', 'jit', 'c++14', 'c++11'], # unsure about second part + 'ps2': ['little_endian'] + ['libco', 'cpu64', 'threads', 'thread-local', 'cdrom', 'usb', 'jit', 'c++14', 'c++11'], # unsure about second part + 'ps3': ['threads', 'thread-local', 'cpu64'] + ['libco', 'cdrom', 'usb', 'jit', 'c++14', 'c++11'], # unsure about second part + 'psp': ['libco', 'threads', 'thread-local', 'little_endian'] + ['jit', 'c++14', 'c++11'], # unsure about second part + 'libnx-aarch64': ['gfxaccel', 'gl1', 'gl2', 'gl3', 'libco', 'cpu64', 'threads', 'thread-local', 'jit', 'little_endian'] + ['usb', 'c++14', 'c++11'], # unsure about second part + 'wiiu': ['libco'] + ['cdrom', 'usb', 'jit', 'c++14', 'c++11'] + ['threads'], # unsure about second part. Threads are present in OS but not in rthreads yet + 'vita': ['gfxaccel', 'gl1', 'gl2', 'threads', 'thread-local', 'libco', 'jit', 'little_endian', 'c++14', 'c++11'], # 'gl3', 'gles2', 'gles3'? + + # UWP + 'windows-uwp-arm': UWP + ['little_endian'], + 'windows-uwp-x64': UWP + ['x86_any', 'cpu64', 'little_endian'], + 'windows-uwp-x86': UWP + ['x86_any', 'little_endian'], + + # Mobile + 'android-arm64-v8a': ANDROID + ['cpu64'], + 'android-armeabi-v7a': ANDROID, + 'android-x86': ANDROID + ['x86_any'], + 'android-x86_64': ANDROID + ['x86_any', 'cpu64'], + 'ios': MOBILE_LE + ['physfs', 'c++14', 'c++11'], + 'ios9': MOBILE_LE + ['physfs', 'c++14', 'c++11'], + 'ios-arm64': MOBILE_LE + ['cpu64', 'physfs', 'thread-local', 'c++14', 'c++11'], + 'tvos-arm64': MOBILE_LE + ['cpu64', 'physfs', 'thread-local', 'c++14', 'c++11'], + 'qnx': MOBILE_LE + ['physfs', 'thread-local', 'c++14', 'c++11', 'jvm'], # Unsure about usb and thread-local + + # Desktop + 'linux-x64': DESKTOP_X64, + 'windows-x64': DESKTOP_X64, + 'osx-x64': DESKTOP_X64, + 'linux-i686': DESKTOP_X86, + 'windows-i686': DESKTOP_X86, + 'linux-arm7neonhf': DESKTOP_ARM32LE, + 'linux-armhf': DESKTOP_ARM32LE, + 'xbox-x86': DESKTOP_X86, + 'windows-msvc05-i686': DESKTOP_X86_NO_CXX11, + 'windows-msvc10-i686': DESKTOP_X86_NO_CXX11, + 'windows-msvc10-x64': DESKTOP_X64_NO_CXX11, + 'osx-ppc': [x for x in DESKTOP_PPC if x != 'c++14' and x != 'c++11'] +} +features_cores = { + '3dengine': ['gl2'], # Should be gl2 or gles2 but current bugs prevent operating with gles2 + 'atari800': ['libco'], + 'blastem': ['x86_any'], + 'boom3': ['gl1'], + 'boom3-xp': ['gl1'], + 'bsnes': ['libco'], + 'bsnes2014': ['libco'], + 'bsnes-libretro-cplusplus98': ['libco'], + 'bsnes-hd': ['libco'], + 'bsnes-mercury': ['libco'], + 'chailove': ['physfs', 'thread-local', 'threads'], + 'citra': ['gfxaccel'], + 'citra2018': ['gfxaccel'], + 'Craft': ['gfxaccel'], + 'chailove': ['c++14'], + 'dolphin': ['cpu64', 'jit'], + 'dosbox-svn': ['libco'], + 'dosbox-core': ['threads'], + 'dosbox-pure': ['c++11', 'threads'], + 'ffmpeg': ['threads'], + 'flycast': ['gfxaccel'], + 'flycast-upstream': ['gfxaccel'], + 'frodo': ['libco'], + 'hatari': ['libco'], + 'gpsp': ['libco'], + 'ishiiruka': ['cpu64'], + 'kronos': ['gl3'], + 'mupen64plus': ['gfxaccel', 'libco'], + 'neocd': ['c++11'], + 'Omicron': ['gfxaccel', 'jvm'], + 'OpenLara': ['gfxaccel'], + 'parallel-n64': ['gfxaccel', 'libco'], + 'pcem': ['threads'], + 'play': ['gfxaccel'], + 'redbook': ['cdrom'], + 'remotejoy': ['usb'], + 'retro8': ['c++11'], + 'REminiscence': ['libco'], + 'scummvm': ['libco'], + 'ThePowderToy': ['threads'], + 'tic80': ['little_endian'], + 'uae': ['threads'], + 'vitaquake3': ['gl1'], + 'vitavoyager': ['gl1'], + 'yabasanshiro': ['gfxaccel'] +} + +def strip_suffix(s, suffix): + if s.endswith(suffix): + return s[:-len(suffix)] + return s + +def strip_suffixes(s, suffixes): + r = s + for suffix in suffixes + suffixes + suffixes: + r = strip_suffix(r, suffix) + return r + + +def strip_prefix(s, prefix): + if s.startswith(prefix): + return s[len(prefix):] + return s + +def strip_prefixes(s, prefixes): + r = s + for prefix in prefixes: + r = strip_prefix(r, prefix) + return r + +def file_to_platform(fname): + s = strip_suffixes(fname, [ + "-legacy", "-mingw", + + # Mupen64 + "-gles2", "-gles3", + ] + ["-" + x for x in SUBCORE_SUFFIXES]) + s = strip_prefixes(s, ["libretro-", "build-", "static-", + "retroarch-", "dummy-", "deps:", "test:"]) +# for infix in ["msvc05", "msvc10"]: +# s = s.replace("-" + infix + "-", "-") + mp = { + 'code_quality': None, + 'ios-9': 'ios9', + 'trigger_static-cores': None, + "android": None, + 'osx': None, + 'switch': None + } + if s in mp: + s = mp[s] + subcore = list(filter(lambda x: "-" + x + "-" in fname + or fname.endswith("-" + x), SUBCORE_SUFFIXES)) + return (s, "-".join(subcore)) + +def repo_to_core(repname): + s = strip_suffixes(repname, ["-nx", "-libretro", "_libretro"]) + s = strip_prefixes(s, ["libretro-"]) + return s + +def page_get(base): + per_page = 20 + res = [] + for page in range(1, 30): + add = requests.get(base + ('per_page=%d&page=%d' % (per_page, page))).json() + res += add + if len(add) != per_page: + return res + return res + +def parse_pipelines(projectid, sha): + pipelines = requests.get('https://%s/api/v4/projects/%d/pipelines?sha=%s&per_page=20' % (hostname, projectid, sha)).json() + for pipeline in pipelines: + if pipeline['status'] == 'success': +# print(pipeline) + return page_get('https://%s/api/v4/projects/%d/pipelines/%d/jobs?' % (hostname, projectid, pipeline['id'])) + return None + +projects_all = page_get('https://%s/api/v4/projects?simple=true&' % hostname) + +projects = list(filter(lambda x: x['namespace']['path'] == namespace, projects_all)) + +for project in projects: + print(project['path_with_namespace']) + projectid = project['id'] + core_base = repo_to_core(project['path']) + if core_base == 'RetroArch': + continue + commits = requests.get('https://%s/api/v4/projects/%d/repository/commits?ref_name=%s' % (hostname, projectid, project['default_branch'])).json() +# print(commits[0]) + jobs = None + for commit in commits: + jobs = parse_pipelines(projectid, commit['id']) + if jobs is not None: + break + if jobs is None: + jobs = [] + if not jobs: + allcores.add(core_base) + for job in jobs: +# print(job) + (platform, subcore) = file_to_platform(job['name']) + if platform is None: + continue + if subcore: + core = core_base + "-" + subcore + else: + core = core_base + allplatformset.add(platform) + allcores.add(core) + k = (platform, core) + if k not in coremap: + coremap[k] = [] + coremap[k].append({'status': job['status']}) + + +allplatforms = sorted(allplatformset) +cf = open ("comptable.csv", "w") +c = csv.writer(cf) + +c.writerow([""] + allplatforms) + +for core in allcores: + row = [core] + for platform in allplatforms: + k = (platform, core) + if k not in coremap: + status = MISSING + else: + status = OK if any(map(lambda x: x['status'], coremap[k])) else BROKEN + corestatus[k] = status + if core in features_cores and platform in features_platforms: + missing = set(features_cores[core]) - set(features_platforms[platform]) + if missing: + corereason[k] = ','.join(missing) + + +for core in sorted (allcores): + if core in ('dosbox-libretro',): + continue + row = [core] + for platform in allplatforms: + k = (platform, core) + st = corestatus[k] + s = st + if st != OK and k in corereason: + s += " (" + corereason[k] + ")" + if st == OK and k in corereason: + print("%s is enabled on %s despite %s" % (core, platform, corereason[k])) + row += [s] + c.writerow(row) + +cf.close() diff --git a/dist/info/DoubleCherryGB_libretro.info b/dist/info/DoubleCherryGB_libretro.info new file mode 100644 index 000000000..767e451a7 --- /dev/null +++ b/dist/info/DoubleCherryGB_libretro.info @@ -0,0 +1,38 @@ +# Software Information +display_name = "Nintendo - Game Boy / Color (DoubleCherryGB)" +authors = "GIGO|Hii|TimOelrichs" +supported_extensions = "cgb|dmg|gb|gbc|sgb" +corename = "DoubleCherryGB" +license = "GPLv2" +permissions = "" +display_version = "v0.1.0" +categories = "Emulator" + +# Hardware Information +manufacturer = "Nintendo" +systemname = "Game Boy/Game Boy Color" +systemid = "game_boy" + +# Libretro Features +supports_no_game = "false" +database = "Nintendo - Game Boy|Nintendo - Game Boy Color" +savestate = "true" +savestate_features = "deterministic" +cheats = "false" +input_descriptors = "true" +memory_descriptors = "false" +libretro_saves = "true" +core_options = "true" +load_subsystem = "false" +hw_render = "false" +needs_fullpath = "false" +disk_control = "false" +is_experimental = "false" + +description = "A fork of the TGB Dual Game Boy core with added DMG07(4-Player-Adapter) emulation. +While this core is a decent, usable emulator, it is most notable for being able to emulate to Game Boys connected via Link Cable, which is useful for things like trading Pokemon, etc. +DoubleCherryGB added the emulation of the GAMEBOY 4 PLAYER ADATPTER (DMG-07) and 4Player Link Hacks like the Tetris 4Player Hack. + +For now it's the 4 Player features are not ready for netplay. + +Thanks to the core's modest hardware requirements, it should run well even on low-powered hardware, though users with more powerful hardware may be better served by the SameBoy core, which can also do the same Link Cable functionality but with improved accuracy and compatibility." diff --git a/recipes/android/cores-android b/recipes/android/cores-android index 0422c57f8..3ea722881 100644 --- a/recipes/android/cores-android +++ b/recipes/android/cores-android @@ -10,6 +10,7 @@ bsnes2014 libretro-bsnes2014 https://github.com/libretro/bsnes2014.git libretro bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC_JNI Makefile target-libretro/jni | bsnes_mercury_accuracy:profile=accuracy bsnes_mercury_balanced:profile=balanced bsnes_mercury_performance:profile=performance cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC_JNI Makefile jni daphne libretro-daphne https://github.com/libretro/daphne.git master YES GENERIC_JNI Makefile jni +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC_JNI Makefile jni cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC_JNI Makefile.libretro jni chailove libretro-chailove https://github.com/libretro/libretro-chailove.git master YES GENERIC_JNI Makefile jni craft libretro-craft https://github.com/libretro/Craft.git master YES GENERIC_JNI Makefile.libretro jni diff --git a/recipes/apple/cores-ios-arm64-generic b/recipes/apple/cores-ios-arm64-generic index 1ef54bca9..698cf0bb0 100644 --- a/recipes/apple/cores-ios-arm64-generic +++ b/recipes/apple/cores-ios-arm64-generic @@ -14,6 +14,7 @@ crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master daphne libretro-daphne https://github.com/libretro/daphne.git master YES GENERIC Makefile . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master NO GENERIC Makefile . easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro diff --git a/recipes/apple/cores-ios-generic b/recipes/apple/cores-ios-generic index bc66737ba..265963dde 100644 --- a/recipes/apple/cores-ios-generic +++ b/recipes/apple/cores-ios-generic @@ -15,6 +15,7 @@ crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master daphne libretro-daphne https://github.com/libretro/daphne.git master YES GENERIC Makefile . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC Makefile.libretro desmume +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile . easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic index fd19db6fa..b0df42dea 100644 --- a/recipes/apple/cores-osx-x64-generic +++ b/recipes/apple/cores-osx-x64-generic @@ -19,6 +19,7 @@ crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master daphne libretro-daphne https://github.com/libretro/daphne.git master YES GENERIC Makefile . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC Makefile.libretro desmume +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile . dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAKE Makefile build -DLIBRETRO=ON -DENABLE_QT=0 -DCMAKE_BUILD_TYPE=Release dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_macos diff --git a/recipes/apple/cores-tvos-arm64-generic b/recipes/apple/cores-tvos-arm64-generic index 716858e2c..aecb046fe 100644 --- a/recipes/apple/cores-tvos-arm64-generic +++ b/recipes/apple/cores-tvos-arm64-generic @@ -14,6 +14,7 @@ crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master daphne libretro-daphne https://github.com/libretro/daphne.git master YES GENERIC Makefile . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master NO GENERIC Makefile . easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro diff --git a/recipes/blackberry/cores-qnx-generic b/recipes/blackberry/cores-qnx-generic index 48a5dfb0c..738c4d686 100644 --- a/recipes/blackberry/cores-qnx-generic +++ b/recipes/blackberry/cores-qnx-generic @@ -9,6 +9,7 @@ cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES G crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile . dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile . dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=arm +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro emux libretro-emux https://github.com/libretro/emux master YES LEIRADEL Makefile libretro | emux_chip8:MACHINE=chip8 emux_gb:MACHINE=gb emux_nes:MACHINE=nes emux_sms:MACHINE=sms fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro diff --git a/recipes/emscripten/emscripten b/recipes/emscripten/emscripten index b695d5bd9..4852db6e2 100644 --- a/recipes/emscripten/emscripten +++ b/recipes/emscripten/emscripten @@ -12,6 +12,7 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master NO GENER desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro NO GENERIC Makefile.libretro libretro dosbox_pure libretro-dosbox_pure https://github.com/libretro/dosbox-pure main YES GENERIC Makefile . +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro . diff --git a/recipes/linux/cores-linux-arm7neonhf b/recipes/linux/cores-linux-arm7neonhf index 3bd175854..c78f902ee 100644 --- a/recipes/linux/cores-linux-arm7neonhf +++ b/recipes/linux/cores-linux-arm7neonhf @@ -19,6 +19,7 @@ desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git mas dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile . dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=arm WITH_FAKE_SDL=1 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro target=arm WITH_FAKE_SDL=1 +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro diff --git a/recipes/linux/cores-linux-armhf-generic b/recipes/linux/cores-linux-armhf-generic index 8c847a394..b140206d1 100644 --- a/recipes/linux/cores-linux-armhf-generic +++ b/recipes/linux/cores-linux-armhf-generic @@ -19,6 +19,7 @@ dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YE dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_armhf dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=arm WITH_FAKE_SDL=1 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro target=arm WITH_FAKE_SDL=1 +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic index 51bcb8ae0..5797cd3be 100644 --- a/recipes/linux/cores-linux-x64-generic +++ b/recipes/linux/cores-linux-x64-generic @@ -28,6 +28,7 @@ dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAK dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core.git libretro YES GENERIC Makefile.libretro libretro download_github_linux64 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86_64 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86_64 +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . duckstation libretro-duckstation https://github.com/libretro/duckstation.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic index 1453f7ff4..a8ca677c7 100644 --- a/recipes/linux/cores-linux-x86-generic +++ b/recipes/linux/cores-linux-x86-generic @@ -23,6 +23,7 @@ dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YE dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro CC=gcc-9 CXX=g++-9 STATIC_LIBCXX=1 BUNDLED_SDL=1 WITH_DYNAREC=x86 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=x86 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro target=x86 +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro diff --git a/recipes/nintendo/3ds b/recipes/nintendo/3ds index 2fba6a7ca..8454bfee3 100644 --- a/recipes/nintendo/3ds +++ b/recipes/nintendo/3ds @@ -7,6 +7,7 @@ bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile . crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile . dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=oldarm +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro diff --git a/recipes/nintendo/libnx b/recipes/nintendo/libnx index b54a13e9d..cf2859fd4 100644 --- a/recipes/nintendo/libnx +++ b/recipes/nintendo/libnx @@ -11,6 +11,7 @@ crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core.git libretro YES GENERIC Makefile.libretro libretro CMAKE_GENERATOR="Unix Makefiles" dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn.git libretro YES GENERIC Makefile.libretro libretro desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . boom3 libretro-boom3 https://github.com/libretro/boom3.git master YES GENERIC Makefile neo dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master NO GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro diff --git a/recipes/nintendo/wiiu b/recipes/nintendo/wiiu index b0abd888a..62b78361f 100644 --- a/recipes/nintendo/wiiu +++ b/recipes/nintendo/wiiu @@ -7,6 +7,7 @@ cannonball libretro-cannonball https://github.com/libretro/cannonball.git master cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile . crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile . dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro . diff --git a/recipes/playstation/ps3 b/recipes/playstation/ps3 index 8c9fc249c..0333c697d 100644 --- a/recipes/playstation/ps3 +++ b/recipes/playstation/ps3 @@ -5,6 +5,7 @@ cannonball libretro-cannonball https://github.com/libretro/cannonball.git master cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile . desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro NO GENERIC Makefile.libretro libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master NO GENERIC makefile.libretro . diff --git a/recipes/playstation/psp b/recipes/playstation/psp index cfa834b16..dedb761fd 100644 --- a/recipes/playstation/psp +++ b/recipes/playstation/psp @@ -4,6 +4,7 @@ atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git mas bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile . +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile . diff --git a/recipes/playstation/vita b/recipes/playstation/vita index 7ab5863b3..3c6321339 100644 --- a/recipes/playstation/vita +++ b/recipes/playstation/vita @@ -6,6 +6,7 @@ cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES G crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile . desmume libretro-desmume https://github.com/libretro/desmume.git master NO GENERIC Makefile.libretro desmume dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro diff --git a/recipes/windows/cores-windows-msvc2003-x86_dw2-generic b/recipes/windows/cores-windows-msvc2003-x86_dw2-generic index 1c32d1fc9..1fe3ab1e5 100644 --- a/recipes/windows/cores-windows-msvc2003-x86_dw2-generic +++ b/recipes/windows/cores-windows-msvc2003-x86_dw2-generic @@ -1,5 +1,6 @@ 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro . fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro . diff --git a/recipes/windows/cores-windows-msvc2005-x86_dw2-generic b/recipes/windows/cores-windows-msvc2005-x86_dw2-generic index 44c1dc4d9..08ba82db5 100644 --- a/recipes/windows/cores-windows-msvc2005-x86_dw2-generic +++ b/recipes/windows/cores-windows-msvc2005-x86_dw2-generic @@ -1,5 +1,6 @@ 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile . freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-msvc2010-x64_seh-generic b/recipes/windows/cores-windows-msvc2010-x64_seh-generic index 6ecd2105e..030fe846d 100644 --- a/recipes/windows/cores-windows-msvc2010-x64_seh-generic +++ b/recipes/windows/cores-windows-msvc2010-x64_seh-generic @@ -2,6 +2,7 @@ 3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro . +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile . freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-msvc2010-x86_dw2-generic b/recipes/windows/cores-windows-msvc2010-x86_dw2-generic index 2c1fe98f6..311c37422 100644 --- a/recipes/windows/cores-windows-msvc2010-x86_dw2-generic +++ b/recipes/windows/cores-windows-msvc2010-x86_dw2-generic @@ -2,6 +2,7 @@ 3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro . +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile . freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic b/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic index a4bb61ccb..aab46a95c 100644 --- a/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic +++ b/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic @@ -1,6 +1,7 @@ 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic index 0990eed0e..9c9faa469 100644 --- a/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic +++ b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic @@ -1,6 +1,7 @@ 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-msvc2017-uwp-arm-generic b/recipes/windows/cores-windows-msvc2017-uwp-arm-generic index 75b9ae7a5..9b12a55b9 100644 --- a/recipes/windows/cores-windows-msvc2017-uwp-arm-generic +++ b/recipes/windows/cores-windows-msvc2017-uwp-arm-generic @@ -2,6 +2,7 @@ opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic index 423881019..1b3048603 100644 --- a/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic +++ b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic @@ -2,6 +2,7 @@ opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic index 75b9ae7a5..9b12a55b9 100644 --- a/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic +++ b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic @@ -2,6 +2,7 @@ opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro . desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index 67860635e..853b81751 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -26,6 +26,7 @@ dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAK dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_windows_x64 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . duckstation libretro-duckstation https://github.com/libretro/duckstation.git master YES CMAKE sln build -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON -DCMAKE_BUILD_TYPE=Release -G\"Visual Studio 15 2017 Win64\" ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic index 3003f32d6..1688d0684 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -24,6 +24,7 @@ dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YE dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_windows_x86 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . duckstation libretro-duckstation https://github.com/libretro/duckstation.git master YES CMAKE sln build -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON -DCMAKE_BUILD_TYPE=Release -G\"Visual Studio 15 2017\" ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro easyrpg libretro-easyrpg https://github.com/EasyRPG/Player.git master YES CMAKE Makefile build diff --git a/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic b/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic index 38c36a684..862f42684 100644 --- a/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic +++ b/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic @@ -1,6 +1,7 @@ 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro . bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master NO GENERIC Makefile.libretro . dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86 +doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile . fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro . fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro . diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index b7973e119..963e72ce3 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -1128,6 +1128,13 @@ include_core_tgbdual() { libretro_tgbdual_name="TGB Dual" libretro_tgbdual_git_url="https://github.com/libretro/tgbdual-libretro.git" +include_core_doublecherrygb() { + register_module core "doublecherrygb" -ngc -ps3 -wii +} +libretro_doublecherrygb_name="Double Cherry GB" +libretro_doublecherrygb_git_url="https://github.com/TimOelrichs/doublecherryGB-libretro.git" + + include_core_theodore() { register_module core "theodore" }