From dc3b9ca79b07c0f78b64d4eb8412fd0b86d6fb98 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Mon, 25 Mar 2019 23:25:54 -0400 Subject: [PATCH 1/4] db: Add Commodore Plus-4 and VIC-20 @zach-morris found that Commodore Plus-4 and VIC-20 were missing: https://github.com/RobLoach/libretro-thumbnails-check/issues/16 --- libretro-build-database.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libretro-build-database.sh b/libretro-build-database.sh index 54e5812a..01b57945 100755 --- a/libretro-build-database.sh +++ b/libretro-build-database.sh @@ -251,6 +251,8 @@ build_libretro_databases() { build_libretro_database "Coleco - ColecoVision" "rom.crc" build_libretro_database "Commodore - 64" "rom.crc" build_libretro_database "Commodore - Amiga" "rom.crc" + build_libretro_database "Commodore - Plus-4" "rom.crc" + build_libretro_database "Commodore - VIC-20" "rom.crc" build_libretro_database "Dinothawr" "rom.crc" build_libretro_database "Emerson - Arcadia 2001" "rom.crc" build_libretro_database "Entex - Adventure Vision" "rom.crc" From 05327251f9c4e2def3da1f4899c39e4e870a0912 Mon Sep 17 00:00:00 2001 From: Weedy Weed Smoker Date: Fri, 31 May 2019 12:34:28 +0700 Subject: [PATCH 2/4] Add iOS 10 target (FAT binary) The iOS 10 version is the only one supporting both 32-bit and 64-bit architectures --- libretro-build-ios10.sh | 17 +++++++++++++++++ libretro-config.sh | 34 ++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 libretro-build-ios10.sh diff --git a/libretro-build-ios10.sh b/libretro-build-ios10.sh new file mode 100644 index 00000000..7f51772c --- /dev/null +++ b/libretro-build-ios10.sh @@ -0,0 +1,17 @@ +#! /usr/bin/env bash +# vim: set ts=3 sw=3 noet ft=sh : bash + +SCRIPT="${0#./}" +BASE_DIR="${SCRIPT%/*}" +WORKDIR="$PWD" + +if [ "$BASE_DIR" = "$SCRIPT" ]; then + BASE_DIR="$WORKDIR" +else + if [[ "$0" != /* ]]; then + # Make the path absolute + BASE_DIR="$WORKDIR/$BASE_DIR" + fi +fi + +platform=ios10 ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-config.sh b/libretro-config.sh index f2b1456c..4d895234 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -240,15 +240,33 @@ case "$platform" in CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK" ;; + ios10) + DIST_DIR="ios10" + FORMAT_EXT=dylib + IOS=1 + ARCH=armv7 arm64 + FORMAT=_ios + FORMAT_COMPILER_TARGET=ios10 + FORMAT_COMPILER_TARGET_ALT=ios10 + export IOSSDK=$(xcodebuild -version -sdk iphoneos Path) + + # Use generic names rather than gcc/clang to better support both + CC="cc -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK" + CXX="c++ -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK" + CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK" + ;; + ios-arm64) - DIST_DIR="ios-arm64" - FORMAT_EXT=dylib - IOS=1 - ARCH=arm64 - FORMAT=_ios - FORMAT_COMPILER_TARGET=ios-arm64 - FORMAT_COMPILER_TARGET_ALT=ios-arm64 - export IOSSDK=$(xcodebuild -version -sdk iphoneos Path) + DIST_DIR="ios-arm64" + FORMAT_EXT=dylib + IOS=1 + ARCH=arm64 + FORMAT=_ios + FORMAT_COMPILER_TARGET=ios-arm64 + FORMAT_COMPILER_TARGET_ALT=ios-arm64 + export IOSSDK=$(xcodebuild -version -sdk iphoneos Path) + + # Use generic names rather than gcc/clang to better support both CC="cc -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK" CXX="c++ -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK" CXX11="clang++ -std=c++11 -stdlib=libc++ -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK" From d22588f668592d7fd506e68e4c6acd039a62623f Mon Sep 17 00:00:00 2001 From: Weedy Weed Smoker Date: Mon, 3 Jun 2019 05:19:30 +0700 Subject: [PATCH 3/4] Add Fairchild ChannelF (freechaf) --- build-config.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-config.sh b/build-config.sh index 6ed208ac..57375130 100644 --- a/build-config.sh +++ b/build-config.sh @@ -184,6 +184,9 @@ include_core_quasi88 include_core_nekop2 include_core_np2kai +# --- Fairchild ChannelF cores --- +include_core_freechaf + # --- Sharp X-68000 emulator cores --- include_core_px68k From 28163311dd18dbf84b57da320472a08ad05831aa Mon Sep 17 00:00:00 2001 From: Weedy Weed Smoker Date: Mon, 3 Jun 2019 05:24:32 +0700 Subject: [PATCH 4/4] Add Fairchild ChannelF (freechaf) --- rules.d/core-rules.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index 97b77843..cfbe1384 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -920,6 +920,13 @@ libretro_stonesoup_git_submodules="clone" libretro_stonesoup_build_subdir="crawl-ref" libretro_stonesoup_build_makefile="Makefile.libretro" +include_core_freechaf() { + register_module core "freechaf" -ngc -ps3 -psp1 -qnx -wii +} +libretro_freechaf_name="FreeChaF" +libretro_freechaf_git_url="https://github.com/libretro/FreeChaF.git" +libretro_freechaf_build_makefile="Makefile" + include_core_hatari() { register_module core "hatari" -theos_ios -ngc -ps3 -psp1 -qnx -wii }