Skip to content

Commit

Permalink
Merge pull request #1764 from TimOelrichs/master
Browse files Browse the repository at this point in the history
Add Double Cherry GB core
  • Loading branch information
LibretroAdmin authored Dec 17, 2023
2 parents 7e0ef7f + 774923b commit 6c39b58
Show file tree
Hide file tree
Showing 52 changed files with 688 additions and 604 deletions.
6 changes: 3 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*.sh eol=lf
recipes/** eol=lf
dist/** eol=lf
*.sh eol=lf
recipes/** eol=lf
dist/** eol=lf
54 changes: 27 additions & 27 deletions .github/workflows/core_info_package.yml
Original file line number Diff line number Diff line change
@@ -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
24 changes: 12 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
36 changes: 18 additions & 18 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
7 changes: 7 additions & 0 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"ExpandedNodes": [
""
],
"SelectedNode": "\\C:\\Users\\TimZen\\Source\\Repos\\libretro-super",
"PreviewInSolutionExplorer": false
}
Binary file not shown.
Binary file added .vs/libretro-super/v17/.wsuo
Binary file not shown.
Binary file added .vs/slnx.sqlite
Binary file not shown.
18 changes: 9 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
42 changes: 21 additions & 21 deletions COPYING
Original file line number Diff line number Diff line change
@@ -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.
28 changes: 14 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
30 changes: 15 additions & 15 deletions Makefile.bsd
Original file line number Diff line number Diff line change
@@ -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
24 changes: 12 additions & 12 deletions Makefile.libnx
Original file line number Diff line number Diff line change
@@ -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
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
26 changes: 13 additions & 13 deletions cmake/blackberry.cmake
Original file line number Diff line number Diff line change
@@ -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")
Loading

0 comments on commit 6c39b58

Please sign in to comment.