Updated by kodi-game-scripting

https://github.com/kodi-game/kodi-game-scripting/
kodi-game · Jul 18, 2024 · 69cce77 · 69cce77
1 parent 1165b91
commit 69cce77
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 19 deletions.
diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml
@@ -2,7 +2,7 @@ name: Sync addon metadata translations
 
 on:
   push:
-    branches: [ master, Matrix, Nexus ]
+    branches: [ master, Matrix, Nexus, Omega ]
     paths:
       - '**addon.xml.in'
       - '**resource.language.**strings.po'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
 find_package(Kodi REQUIRED)
 
+set(CMAKE_CXX_STANDARD 17)
+
 # CMake on windows only searches for .lib libraries (static library or import library).
 # The libretro game library is dynamically loaded so even if an import library would exists it's of no use.
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"])
+buildPlugin(version: "Omega", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"])
diff --git a/depends/common/dosbox-core/CMakeLists.txt b/depends/common/dosbox-core/CMakeLists.txt
@@ -22,16 +22,40 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
   else()
     set(MSYSTEM MINGW32)
   endif()
-  set(BUILD_COMMAND ${MINGW_MAKE} -j$ENV{NUMBER_OF_PROCESSORS} -C libretro -f Makefile.libretro platform=win MSYSTEM=${MSYSTEM} BUNDLED_SDL=1 ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND ${MINGW_MAKE}
+                    -j$ENV{NUMBER_OF_PROCESSORS}
+                    -C libretro
+                    -f Makefile.libretro
+                    ${LIBRETRO_DEBUG}
+                    GIT_VERSION=
+                    MSYSTEM=${MSYSTEM}
+                    platform=win
+                    BUNDLED_SDL=1)
 elseif(CORE_SYSTEM_NAME STREQUAL linux)
-  set(BUILD_COMMAND $(MAKE) -C libretro -f Makefile.libretro BUNDLED_SDL=1 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -C libretro
+                    -f Makefile.libretro
+                    ${LIBRETRO_DEBUG}
+                    GIT_VERSION=
+                    platform=unix
+                    BUNDLED_SDL=1)
 elseif(CORE_SYSTEM_NAME STREQUAL osx)
   if(CPU STREQUAL arm64)
     set(ARCH arm)
   else()
     set(ARCH intel)
   endif()
-  set(BUILD_COMMAND $(MAKE) -C libretro -f Makefile.libretro BUNDLED_SDL=1 platform=osx arch=${ARCH} ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -C libretro
+                    -f Makefile.libretro
+                    ${LIBRETRO_DEBUG}
+                    arch=${ARCH}
+                    CROSS_COMPILE=1
+                    GIT_VERSION=
+                    LIBRETRO_APPLE_ISYSROOT=${CMAKE_OSX_SYSROOT}
+                    LIBRETRO_APPLE_PLATFORM=${CPU}-apple-macos
+                    platform=osx
+                    BUNDLED_SDL=1)
 elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   if(CORE_PLATFORM_NAME STREQUAL ios)
     set(LIBRETRO_SONAME dosbox_core_libretro_ios${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -40,10 +64,22 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedde
     else()
       set(PLATFORM ios)
     endif()
-    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) -C libretro -f Makefile.libretro BUNDLED_SDL=1 platform=${PLATFORM} ${LIBRETRO_DEBUG} GIT_VERSION=)
+    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
+                                                  -C libretro
+                                                  -f Makefile.libretro
+                                                  ${LIBRETRO_DEBUG}
+                                                  GIT_VERSION=
+                                                  platform=${PLATFORM}
+                                                  BUNDLED_SDL=1)
   elseif(CORE_PLATFORM_NAME STREQUAL tvos)
     set(LIBRETRO_SONAME dosbox_core_libretro_tvos${CMAKE_SHARED_LIBRARY_SUFFIX})
-    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) -C libretro -f Makefile.libretro BUNDLED_SDL=1 platform=tvos-arm64 ${LIBRETRO_DEBUG} GIT_VERSION=)
+    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
+                                                  -C libretro
+                                                  -f Makefile.libretro
+                                                  ${LIBRETRO_DEBUG}
+                                                  GIT_VERSION=
+                                                  platform=tvos-arm64
+                                                  BUNDLED_SDL=1)
   endif()
 elseif(CORE_SYSTEM_NAME STREQUAL android)
   if(NOT NDKROOT)
@@ -56,13 +92,27 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
   else()
     message(FATAL_ERROR "${PROJECT_NAME} needs Android ${CPU} build command in CMakeLists.txt!")
   endif()
-  set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build -C libretro/jni APP_ABI=${PLATFORM} V7NEONOPTIMIZATION=1 GIT_VERSION=
-                                    NDK_LIBS_OUT=${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR} BUNDLED_SDL=1 ${LIBRETRO_DEBUG} V=1
+  set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build
+                                    -C libretro/jni
+                                    ${LIBRETRO_DEBUG}
+                                    APP_ABI=${PLATFORM}
+                                    APP_SHORT_COMMANDS=true
+                                    GIT_VERSION=
+                                    NDK_LIBS_OUT=${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}
+                                    V=1
+                                    V7NEONOPTIMIZATION=1
+                                    BUNDLED_SDL=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 libretro -f Makefile.libretro BUNDLED_SDL=1 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -C libretro
+                    -f Makefile.libretro
+                    ${LIBRETRO_DEBUG
+                    GIT_VERSION=
+                    platform=unix
+                    BUNDLED_SDL=1)
 else()
   message(FATAL_ERROR "${PROJECT_NAME} - Unknown system: ${CORE_SYSTEM_NAME}")
 endif()

diff --git a/depends/common/dosbox-core/dosbox-core.txt b/depends/common/dosbox-core/dosbox-core.txt
@@ -1 +1 @@
-dosbox-core https://github.com/realnc/dosbox-core/archive/3acbd34955a4fa04b829ca827b79672426bfdd16.tar.gz
+dosbox-core https://github.com/realnc/dosbox-core/archive/27b6dbe8608ff63aaf8d5b7257a2b08c7d1a7a90.tar.gz
diff --git a/game.libretro.dosbox-core/addon.xml.in b/game.libretro.dosbox-core/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.dosbox-core"
 		name="DOS (DOSBox-core)"
-		version="4482.0.0.18"
+		version="4482.0.0.19"
 		provider-name="DOSBox Team, radius, Nikos Chantziaras">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>
@@ -35,8 +35,5 @@
 		<description lang="it_IT">Un core DOSBox da utilizzare in RetroArch e altri frontend libretro.</description>
 		<description lang="ko_KR">RetroArch 및 기타 libretro 프론트엔드에서 사용하기 위한 DOSBox 코어.</description>
 		<description lang="zh_CN">用于 RetroArch 和其他 libretro 前端的 DOSBox 核心。</description>
-		<lifecyclestate type="broken" lang="en_GB">DOSBox-Core is broken. Use DOSBox or DOSBox-Pure.</lifecyclestate>
-		<lifecyclestate type="broken" lang="es_ES">DOSBox-Core está roto. Utiliza DOSBox o DOSBox-Pure.</lifecyclestate>
-		<lifecyclestate type="broken" lang="ko_KR">DOSBox-Core가 손상되었습니다. DOSBox 또는 DOSBox-Pure를 사용하십시오.</lifecyclestate>
 	</extension>
 </addon>
diff --git a/game.libretro.dosbox-core/resources/language/resource.language.en_gb/strings.po b/game.libretro.dosbox-core/resources/language/resource.language.en_gb/strings.po
@@ -23,7 +23,3 @@ msgstr ""
 msgctxt "Addon Description"
 msgid "A DOSBox core for use in RetroArch and other libretro frontends."
 msgstr ""
-
-msgctxt "Addon Lifecyclestate"
-msgid "DOSBox-Core is broken. Use DOSBox or DOSBox-Pure."
-msgstr ""