From abca7395d52eff09381fd8b565b690ee14d21b16 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sun, 14 Jan 2024 06:51:58 +0000 Subject: [PATCH] Updated by kodi-game-scripting https://github.com/kodi-game/kodi-game-scripting/ --- Jenkinsfile | 2 +- depends/common/genplus-wide/CMakeLists.txt | 7 ++++++- depends/common/genplus-wide/genplus-wide.txt | 2 +- depends/windows/mingw/CMakeLists.txt | 15 +++++++-------- game.libretro.genplus-wide/addon.xml.in | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a4c5f12..aaa3557 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1 @@ -buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "windows-i686", "windows-x86_64"]) +buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"]) diff --git a/depends/common/genplus-wide/CMakeLists.txt b/depends/common/genplus-wide/CMakeLists.txt index 8932e51..70b46f5 100644 --- a/depends/common/genplus-wide/CMakeLists.txt +++ b/depends/common/genplus-wide/CMakeLists.txt @@ -26,7 +26,12 @@ if(CORE_SYSTEM_NAME STREQUAL windows) elseif(CORE_SYSTEM_NAME STREQUAL linux) set(BUILD_COMMAND $(MAKE) -C . -f Makefile.libretro platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=) elseif(CORE_SYSTEM_NAME STREQUAL osx) - set(BUILD_COMMAND $(MAKE) -C . -f Makefile.libretro platform=osx ${LIBRETRO_DEBUG} GIT_VERSION=) + if(CPU STREQUAL arm64) + set(ARCH arm) + else() + set(ARCH intel) + endif() + set(BUILD_COMMAND $(MAKE) -C . -f Makefile.libretro platform=osx arch=${ARCH} ${LIBRETRO_DEBUG} GIT_VERSION=) elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded) if(CORE_PLATFORM_NAME STREQUAL ios) set(LIBRETRO_SONAME genesis_plus_gx_wide_libretro_ios${CMAKE_SHARED_LIBRARY_SUFFIX}) diff --git a/depends/common/genplus-wide/genplus-wide.txt b/depends/common/genplus-wide/genplus-wide.txt index 068fc9a..bd88bc1 100644 --- a/depends/common/genplus-wide/genplus-wide.txt +++ b/depends/common/genplus-wide/genplus-wide.txt @@ -1 +1 @@ -genplus-wide https://github.com/libretro/Genesis-Plus-GX-Wide/archive/659329cbfbc3267f4f617910a3ecee60dd655dac.tar.gz +genplus-wide https://github.com/libretro/Genesis-Plus-GX-Wide/archive/d5531ca58d628a2ba6f791804aa01e2fb2cb0e13.tar.gz diff --git a/depends/windows/mingw/CMakeLists.txt b/depends/windows/mingw/CMakeLists.txt index c42cea2..a4c2779 100644 --- a/depends/windows/mingw/CMakeLists.txt +++ b/depends/windows/mingw/CMakeLists.txt @@ -1,14 +1,13 @@ cmake_minimum_required(VERSION 3.5) project(mingw) -# TODO: Upload msys2 packages to mirrors -#foreach(repo msys mingw32 mingw64) -# if(${repo} STREQUAL msys) -# file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}2/$arch\n") -# else() -# file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n") -# endif() -#endforeach() +foreach(repo msys mingw32 mingw64) + if(${repo} STREQUAL msys) + file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}2/$arch\n") + else() + file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n") + endif() +endforeach() include(CheckSymbolExists) check_symbol_exists(_X86_ "Windows.h" _X86_) diff --git a/game.libretro.genplus-wide/addon.xml.in b/game.libretro.genplus-wide/addon.xml.in index 0d58a88..51e4e4c 100644 --- a/game.libretro.genplus-wide/addon.xml.in +++ b/game.libretro.genplus-wide/addon.xml.in @@ -1,7 +1,7 @@