From 93a571658ac8e9e22a7a47582bce050d3f0de4b7 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sun, 14 Jan 2024 07:28:07 +0000 Subject: [PATCH] Updated by kodi-game-scripting https://github.com/kodi-game/kodi-game-scripting/ --- Jenkinsfile | 2 +- depends/common/daphne/CMakeLists.txt | 7 ++++++- depends/windows/mingw/CMakeLists.txt | 15 +++++++-------- game.libretro.daphne/addon.xml.in | 2 +- 4 files changed, 15 insertions(+), 11 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/daphne/CMakeLists.txt b/depends/common/daphne/CMakeLists.txt index c6c6fd4..4857cb4 100644 --- a/depends/common/daphne/CMakeLists.txt +++ b/depends/common/daphne/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 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=) elseif(CORE_SYSTEM_NAME STREQUAL osx) - set(BUILD_COMMAND $(MAKE) -C . -f Makefile 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 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 daphne_libretro_ios${CMAKE_SHARED_LIBRARY_SUFFIX}) 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.daphne/addon.xml.in b/game.libretro.daphne/addon.xml.in index c701384..8c9e136 100644 --- a/game.libretro.daphne/addon.xml.in +++ b/game.libretro.daphne/addon.xml.in @@ -1,7 +1,7 @@