Updated by kodi-game-scripting

https://github.com/kodi-game/kodi-game-scripting/
kodi-game · Jul 19, 2024 · d167eed · d167eed
1 parent 5486e08
commit d167eed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/depends/common/scummvm/CMakeLists.txt b/depends/common/scummvm/CMakeLists.txt
@@ -11,14 +11,14 @@ string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 # Use it if available
 if(DEFINED ENV{BUILDTHREADS})
   set(build_job_count -j$ENV{BUILDTHREADS})
-  message(WARNING "Using $ENV{BUILDTHREADS} threads from ENV var 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(WARNING "Using ${cpu_count} threads deduced by ProcessorCount")
+    message(STATUS "Using ${cpu_count} threads deduced by ProcessorCount")
   endif()
 endif()
 
@@ -38,20 +38,20 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
     set(MSYSTEM MINGW32)
   endif()
   set(BUILD_COMMAND ${MINGW_MAKE}
-                    ${build_job_count}
-                    ${LIBRETRO_DEBUG}
                     -C backends/platform/libretro
                     -f Makefile
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     MSYSTEM=${MSYSTEM}
                     platform=win
                     )
 elseif(CORE_SYSTEM_NAME STREQUAL linux)
   set(BUILD_COMMAND $(MAKE)
-                    ${build_job_count}
-                    ${LIBRETRO_DEBUG}
                     -C backends/platform/libretro
                     -f Makefile
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     platform=unix
                     )
@@ -62,11 +62,12 @@ elseif(CORE_SYSTEM_NAME STREQUAL osx)
     set(ARCH intel)
   endif()
   set(BUILD_COMMAND $(MAKE)
-                    ${build_job_count}
-                    ${LIBRETRO_DEBUG}
                     -C backends/platform/libretro
                     -f Makefile
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
                     arch=${ARCH}
+                    ARCH=${ARCH}
                     CROSS_COMPILE=1
                     GIT_VERSION=
                     LIBRETRO_APPLE_ISYSROOT=${CMAKE_OSX_SYSROOT}
@@ -82,20 +83,20 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedde
       set(PLATFORM ios)
     endif()
     set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
-                                                  ${build_job_count}
-                                                  ${LIBRETRO_DEBUG}
                                                   -C backends/platform/libretro
                                                   -f Makefile
+                                                  ${build_job_count}
+                                                  ${LIBRETRO_DEBUG}
                                                   GIT_VERSION=
                                                   platform=${PLATFORM}
                                                   )
   elseif(CORE_PLATFORM_NAME STREQUAL tvos)
     set(LIBRETRO_SONAME scummvm_libretro_tvos${CMAKE_SHARED_LIBRARY_SUFFIX})
     set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
-                                                  ${build_job_count}
-                                                  ${LIBRETRO_DEBUG}
                                                   -C backends/platform/libretro
                                                   -f Makefile
+                                                  ${build_job_count}
+                                                  ${LIBRETRO_DEBUG}
                                                   GIT_VERSION=
                                                   platform=tvos-arm64
                                                   )
@@ -112,25 +113,25 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
     message(FATAL_ERROR "${PROJECT_NAME} needs Android ${CPU} build command in CMakeLists.txt!")
   endif()
   set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build
+                                    -C backends/platform/libretro/jni
                                     ${build_job_count}
                                     ${LIBRETRO_DEBUG}
-                                    -C backends/platform/libretro/jni
                                     APP_ABI=${PLATFORM}
                                     APP_SHORT_COMMANDS=true
                                     GIT_VERSION=
                                     NDK_LIBS_OUT=${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}
-                                    V7NEONOPTIMIZATION=1
                                     V=1
+                                    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)
-                    ${build_job_count}
-                    ${LIBRETRO_DEBUG
                     -C backends/platform/libretro
                     -f Makefile
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     platform=unix
                     )

diff --git a/game.libretro.scummvm/addon.xml.in b/game.libretro.scummvm/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.scummvm"
 		name="ScummVM"
-		version="2.9.0.43"
+		version="2.9.0.44"
 		provider-name="SCUMMVMdev">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>