From 1f7bab09b58f0fff8c69cf6db8f71ea784110168 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Thu, 18 Jul 2024 10:10:18 +0000 Subject: [PATCH] Updated by kodi-game-scripting https://github.com/kodi-game/kodi-game-scripting/ --- .../sync-addon-metadata-translations.yml | 2 +- CMakeLists.txt | 2 + Jenkinsfile | 2 +- depends/common/3dengine/CMakeLists.txt | 66 ++++++++++++++++--- game.libretro.3dengine/addon.xml.in | 2 +- 5 files changed, 63 insertions(+), 11 deletions(-) diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml index a126746..285700a 100644 --- 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 index 490120b..c178f00 100644 --- 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 index aaa3557..55b4a4c 100644 --- 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/3dengine/CMakeLists.txt b/depends/common/3dengine/CMakeLists.txt index 116c73e..4c95658 100644 --- a/depends/common/3dengine/CMakeLists.txt +++ b/depends/common/3dengine/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 . -f Makefile platform=win MSYSTEM=${MSYSTEM} ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND ${MINGW_MAKE} + -j$ENV{NUMBER_OF_PROCESSORS} + -C . + -f Makefile + ${LIBRETRO_DEBUG} + GIT_VERSION= + MSYSTEM=${MSYSTEM} + platform=win + ) elseif(CORE_SYSTEM_NAME STREQUAL linux) - set(BUILD_COMMAND $(MAKE) -C . -f Makefile platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND $(MAKE) + -C . + -f Makefile + ${LIBRETRO_DEBUG} + GIT_VERSION= + platform=unix + ) elseif(CORE_SYSTEM_NAME STREQUAL osx) if(CPU STREQUAL arm64) set(ARCH arm) else() set(ARCH intel) endif() - set(BUILD_COMMAND $(MAKE) -C . -f Makefile platform=osx arch=${ARCH} ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND $(MAKE) + -C . + -f Makefile + ${LIBRETRO_DEBUG} + arch=${ARCH} + CROSS_COMPILE=1 + GIT_VERSION= + LIBRETRO_APPLE_ISYSROOT=${CMAKE_OSX_SYSROOT} + LIBRETRO_APPLE_PLATFORM=${CPU}-apple-macos + platform=osx + ) elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded) if(CORE_PLATFORM_NAME STREQUAL ios) set(LIBRETRO_SONAME 3dengine_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 . -f Makefile platform=${PLATFORM} ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) + -C . + -f Makefile + ${LIBRETRO_DEBUG} + GIT_VERSION= + platform=${PLATFORM} + ) elseif(CORE_PLATFORM_NAME STREQUAL tvos) set(LIBRETRO_SONAME 3dengine_libretro_tvos${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) -C . -f Makefile platform=tvos-arm64 ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) + -C . + -f Makefile + ${LIBRETRO_DEBUG} + GIT_VERSION= + platform=tvos-arm64 + ) 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 jni APP_ABI=${PLATFORM} V7NEONOPTIMIZATION=1 GIT_VERSION= - NDK_LIBS_OUT=${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR} ${LIBRETRO_DEBUG} V=1 + set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build + -C 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 + && 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 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND $(MAKE) + -C . + -f Makefile + ${LIBRETRO_DEBUG + GIT_VERSION= + platform=unix + ) else() message(FATAL_ERROR "${PROJECT_NAME} - Unknown system: ${CORE_SYSTEM_NAME}") endif() diff --git a/game.libretro.3dengine/addon.xml.in b/game.libretro.3dengine/addon.xml.in index ce39375..48cfae7 100644 --- a/game.libretro.3dengine/addon.xml.in +++ b/game.libretro.3dengine/addon.xml.in @@ -1,7 +1,7 @@