Updated by kodi-game-scripting

https://github.com/kodi-game/kodi-game-scripting/
kodi-game · Aug 12, 2024 · 401c401 · 401c401
1 parent c006e05
commit 401c401
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/depends/common/gearsystem/CMakeLists.txt b/depends/common/gearsystem/CMakeLists.txt
@@ -7,6 +7,21 @@ include(ExternalProject)
 
 string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
+# Jenkins CI jobs can have this env var set
+# Use it if available
+if(DEFINED ENV{BUILDTHREADS})
+  set(build_job_count -j$ENV{BUILDTHREADS})
+  message(STATUS "Using $ENV{BUILDTHREADS} threads from ENV var BUILDTHREADS")
+else()
+  # Most likely a non CI build, so do a best attempt just using ProcessorCount
+  include(ProcessorCount)
+  ProcessorCount(cpu_count)
+  if(NOT cpu_count EQUAL 0)
+    set(build_job_count -j${cpu_count})
+    message(STATUS "Using ${cpu_count} threads deduced by ProcessorCount")
+  endif()
+endif()
+
 set(LIBRETRO_BINARY_DIR platforms/libretro)
 set(LIBRETRO_SONAME gearsystem_libretro${CMAKE_SHARED_LIBRARY_SUFFIX})
 set(LIBRETRO_JNISONAME libretro${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -23,9 +38,9 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
     set(MSYSTEM MINGW32)
   endif()
   set(BUILD_COMMAND ${MINGW_MAKE}
-                    -j$ENV{NUMBER_OF_PROCESSORS}
                     -C platforms/libretro
                     -f Makefile
+                    ${build_job_count}
                     ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     MSYSTEM=${MSYSTEM}
@@ -35,6 +50,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL linux)
   set(BUILD_COMMAND $(MAKE)
                     -C platforms/libretro
                     -f Makefile
+                    ${build_job_count}
                     ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     platform=unix
@@ -48,6 +64,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL osx)
   set(BUILD_COMMAND $(MAKE)
                     -C platforms/libretro
                     -f Makefile
+                    ${build_job_count}
                     ${LIBRETRO_DEBUG}
                     arch=${ARCH}
                     CROSS_COMPILE=1
@@ -67,6 +84,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedde
     set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
                                                   -C platforms/libretro
                                                   -f Makefile
+                                                  ${build_job_count}
                                                   ${LIBRETRO_DEBUG}
                                                   GIT_VERSION=
                                                   platform=${PLATFORM}
@@ -76,6 +94,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedde
     set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
                                                   -C platforms/libretro
                                                   -f Makefile
+                                                  ${build_job_count}
                                                   ${LIBRETRO_DEBUG}
                                                   GIT_VERSION=
                                                   platform=tvos-arm64
@@ -94,6 +113,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
   endif()
   set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build
                                     -C platforms/libretro/jni
+                                    ${build_job_count}
                                     ${LIBRETRO_DEBUG}
                                     APP_ABI=${PLATFORM}
                                     APP_SHORT_COMMANDS=true
@@ -103,13 +123,12 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
                                     V7NEONOPTIMIZATION=1
 
                     && cp ${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}/${PLATFORM}/${LIBRETRO_JNISONAME} ${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}/${LIBRETRO_SONAME})
-elseif(CORE_SYSTEM_NAME STREQUAL rbpi)
-  message(FATAL_ERROR "${PROJECT_NAME} needs RPi build command in CMakeLists.txt!")
 elseif(CORE_SYSTEM_NAME STREQUAL freebsd)
   set(BUILD_COMMAND $(MAKE)
                     -C platforms/libretro
                     -f Makefile
-                    ${LIBRETRO_DEBUG
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     platform=unix
                     )

diff --git a/depends/common/gearsystem/gearsystem.txt b/depends/common/gearsystem/gearsystem.txt
@@ -1 +1 @@
-gearsystem https://github.com/drhelius/Gearsystem/archive/6b1b8d15e43096288346f05fdf9baa9f91360aaf.tar.gz
+gearsystem https://github.com/drhelius/Gearsystem/archive/16a2062e80eac83418ff9d5c3762c55168de596d.tar.gz
diff --git a/game.libretro.gearsystem/addon.xml.in b/game.libretro.gearsystem/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.gearsystem"
 		name="Sega - MS/GG/SG-1000 (Gearsystem)"
-		version="3.5.0.15"
+		version="3.5.0.16"
 		provider-name="Ignacio Sanchez">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		gearsystem https://github.com/drhelius/Gearsystem/archive/6b1b8d15e43096288346f05fdf9baa9f91360aaf.tar.gz
		gearsystem https://github.com/drhelius/Gearsystem/archive/16a2062e80eac83418ff9d5c3762c55168de596d.tar.gz