Updated by kodi-game-scripting

https://github.com/kodi-game/kodi-game-scripting/
kodi-game · Dec 15, 2024 · f60ae36 · f60ae36
1 parent 6fb977a
commit f60ae36
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/depends/common/3dengine/CMakeLists.txt b/depends/common/3dengine/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 .)
 set(LIBRETRO_SONAME 3dengine_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 .
                     -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 .
                     -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 .
                     -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 .
                                                   -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 .
                                                   -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 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 .
                     -f Makefile
-                    ${LIBRETRO_DEBUG
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     platform=unix
                     )

diff --git a/game.libretro.3dengine/addon.xml.in b/game.libretro.3dengine/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.3dengine"
 		name="Test Core - 3D Engine"
-		version="1.0.0.27"
+		version="1.0.0.28"
 		provider-name="Team Libretro">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>

diff --git a/game.libretro.3dengine/resources/language/resource.language.en_gb/strings.po b/game.libretro.3dengine/resources/language/resource.language.en_gb/strings.po
@@ -24,9 +24,7 @@ msgctxt "Addon Description"
 msgid "A tech demo for libretro GL with additional features (camera/location/etc)."
 msgstr ""
 
-msgctxt "#30000"
-msgid "Settings"
-msgstr ""
+# Empty string with ID 30000
 
 msgctxt "#30001"
 msgid "Internal resolution"

diff --git a/game.libretro.3dengine/resources/settings.xml b/game.libretro.3dengine/resources/settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
-	<category label="30000">
+	<category label="128">
 		<setting label="30001" type="select" id="3dengine-resolution" values="320x240|360x480|480x272|512x384|512x512|640x240|640x448|640x480|720x576|800x600|960x720|1024x768|1024x1024|1280x720|1280x960|1600x1200|1920x1080|1920x1440|1920x1600|2048x1152|2048x1536|2048x2048|320x240" default="320x240"/>
 		<setting label="30002" type="select" id="3dengine-cube-size" values="0|1|2|4|8|16|32|64|128" default="0"/>
 		<setting label="30003" type="select" id="3dengine-cube-stride" values="2.0|3.0|4.0|5.0|6.0|7.0|8.0" default="2.0"/>