Merge pull request #121 from garbear/macos-arm64

Add support for macOS ARM64
kodi-game · May 26, 2024 · 4345ca1 · 4345ca1
2 parents 17201d8 + e4f123b
commit 4345ca1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/templates/addon/Jenkinsfile.j2 b/templates/addon/Jenkinsfile.j2
@@ -1 +1 @@
-buildPlugin(version: "Nexus", platforms: {{ ['android-aarch64', 'android-armv7', 'osx-x86_64', 'windows-i686', 'windows-x86_64']|reject("in", libretro_repo.exclude_platforms)|list()|tojson() }})
+buildPlugin(version: "Nexus", platforms: {{ ['android-aarch64', 'android-armv7', 'osx-x86_64', 'osx-arm64', 'windows-i686', 'windows-x86_64']|reject("in", libretro_repo.exclude_platforms)|list()|tojson() }})
diff --git a/templates/addon/depends/common/{{ game.name }}/CMakeLists.txt.j2 b/templates/addon/depends/common/{{ game.name }}/CMakeLists.txt.j2
@@ -27,7 +27,12 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
 elseif(CORE_SYSTEM_NAME STREQUAL linux)
   set(BUILD_COMMAND $(MAKE) -C {{ makefile.dir }} -f {{ makefile.file }} {{ config.cmake_options | default('') }} platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
 elseif(CORE_SYSTEM_NAME STREQUAL osx)
-  set(BUILD_COMMAND $(MAKE) -C {{ makefile.dir }} -f {{ makefile.file }} {{ config.cmake_options | default('') }} platform=osx ${LIBRETRO_DEBUG} GIT_VERSION=)
+  if(CPU STREQUAL arm64)
+    set(ARCH arm)
+  else()
+    set(ARCH intel)
+  endif()
+  set(BUILD_COMMAND $(MAKE) -C {{ makefile.dir }} -f {{ makefile.file }} {{ config.cmake_options | default('') }} 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 {{ library.soname }}_ios${CMAKE_SHARED_LIBRARY_SUFFIX})
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		buildPlugin(version: "Nexus", platforms: {{ ['android-aarch64', 'android-armv7', 'osx-x86_64', 'windows-i686', 'windows-x86_64']\|reject("in", libretro_repo.exclude_platforms)\|list()\|tojson() }})
		buildPlugin(version: "Nexus", platforms: {{ ['android-aarch64', 'android-armv7', 'osx-x86_64', 'osx-arm64', 'windows-i686', 'windows-x86_64']\|reject("in", libretro_repo.exclude_platforms)\|list()\|tojson() }})