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/oberon/CMakeLists.txt b/depends/common/oberon/CMakeLists.txt index 93f3922..c627e4f 100644 --- a/depends/common/oberon/CMakeLists.txt +++ b/depends/common/oberon/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 oberon_libretro_ios${CMAKE_SHARED_LIBRARY_SUFFIX}) diff --git a/depends/windows/mingw/mingw.sha256 b/depends/windows/mingw/mingw.sha256 index 3398fc6..b4768dc 100644 --- a/depends/windows/mingw/mingw.sha256 +++ b/depends/windows/mingw/mingw.sha256 @@ -1 +1 @@ -fa75120560563a311241c05882016978bd35612692c7f0d39815a27837bff27d +4013a9d5e51b448343efc24fc6a324cc999bb96b4c01b13a6bd3c661bb5c8a82 diff --git a/depends/windows/mingw/mingw.txt b/depends/windows/mingw/mingw.txt index dfd57e1..b79b9bd 100644 --- a/depends/windows/mingw/mingw.txt +++ b/depends/windows/mingw/mingw.txt @@ -1 +1 @@ -mingw http://mirrors.kodi.tv/build-deps/win32/msys2/msys2-base-x86_64-20231026.tar.xz +mingw http://mirrors.kodi.tv/build-deps/win32/msys2/msys2-base-x86_64-20210725.tar.xz diff --git a/game.libretro.oberon/addon.xml.in b/game.libretro.oberon/addon.xml.in index f9a6b93..ff3acdf 100644 --- a/game.libretro.oberon/addon.xml.in +++ b/game.libretro.oberon/addon.xml.in @@ -1,7 +1,7 @@