diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml index 511f684..5fd73c8 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 51582d4..0f55d7a 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/vice_xcbm5x0/CMakeLists.txt b/depends/common/vice_xcbm5x0/CMakeLists.txt index dba101c..61d581c 100644 --- a/depends/common/vice_xcbm5x0/CMakeLists.txt +++ b/depends/common/vice_xcbm5x0/CMakeLists.txt @@ -22,16 +22,36 @@ 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} EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND ${MINGW_MAKE} + -j$ENV{NUMBER_OF_PROCESSORS} + -C . + -f Makefile + platform=win + MSYSTEM=${MSYSTEM} + EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=) elseif(CORE_SYSTEM_NAME STREQUAL linux) - set(BUILD_COMMAND $(MAKE) -C . -f Makefile EMUTYPE=xcbm5x0 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND $(MAKE) + -j + -C . + -f Makefile + platform=unix + EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=) 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 EMUTYPE=xcbm5x0 platform=osx arch=${ARCH} ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND $(MAKE) + -j + -C . + -f Makefile + platform=osx + arch=${ARCH} + CROSS_COMPILE=1 + LIBRETRO_APPLE_PLATFORM=${CPU}-apple-macos + LIBRETRO_APPLE_ISYSROOT=${CMAKE_OSX_SYSROOT} + EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=) elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded) if(CORE_PLATFORM_NAME STREQUAL ios) set(LIBRETRO_SONAME vice_xcbm5x0_libretro_ios${CMAKE_SHARED_LIBRARY_SUFFIX}) @@ -40,10 +60,20 @@ 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 EMUTYPE=xcbm5x0 platform=${PLATFORM} ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) + -j + -C . + -f Makefile + platform=${PLATFORM} + EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=) elseif(CORE_PLATFORM_NAME STREQUAL tvos) set(LIBRETRO_SONAME vice_xcbm5x0_libretro_tvos${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) -C . -f Makefile EMUTYPE=xcbm5x0 platform=tvos-arm64 ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) + -j + -C . + -f Makefile + platform=tvos-arm64 + EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=) endif() elseif(CORE_SYSTEM_NAME STREQUAL android) if(NOT NDKROOT) @@ -56,13 +86,23 @@ 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} EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} V=1 + set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build + -C jni + APP_ABI=${PLATFORM} + V7NEONOPTIMIZATION=1 + NDK_LIBS_OUT=${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR} + V=1 + EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION= && 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 EMUTYPE=xcbm5x0 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=) + set(BUILD_COMMAND $(MAKE) + -j + -C . + -f Makefile + platform=unix + EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=) else() message(FATAL_ERROR "${PROJECT_NAME} - Unknown system: ${CORE_SYSTEM_NAME}") endif() diff --git a/depends/common/vice_xcbm5x0/vice_xcbm5x0.txt b/depends/common/vice_xcbm5x0/vice_xcbm5x0.txt index 4ef99c5..5ded19d 100644 --- a/depends/common/vice_xcbm5x0/vice_xcbm5x0.txt +++ b/depends/common/vice_xcbm5x0/vice_xcbm5x0.txt @@ -1 +1 @@ -vice_xcbm5x0 https://github.com/libretro/vice-libretro/archive/0046085610289777b5806495d8eef213e0a201aa.tar.gz +vice_xcbm5x0 https://github.com/libretro/vice-libretro/archive/d884b8125905551e2832b5eee524db74defc2e00.tar.gz diff --git a/game.libretro.vice_xcbm5x0/addon.xml.in b/game.libretro.vice_xcbm5x0/addon.xml.in index 742a940..a52188a 100644 --- a/game.libretro.vice_xcbm5x0/addon.xml.in +++ b/game.libretro.vice_xcbm5x0/addon.xml.in @@ -1,7 +1,7 @@ diff --git a/game.libretro.vice_xcbm5x0/resources/language/resource.language.en_gb/strings.po b/game.libretro.vice_xcbm5x0/resources/language/resource.language.en_gb/strings.po index 6de66ae..4ed561d 100644 --- a/game.libretro.vice_xcbm5x0/resources/language/resource.language.en_gb/strings.po +++ b/game.libretro.vice_xcbm5x0/resources/language/resource.language.en_gb/strings.po @@ -240,10 +240,6 @@ msgctxt "#30053" msgid "Input > Analog Stick Mouse Deadzone" msgstr "" -msgctxt "#30054" -msgid "Input > Analog Stick Mouse Speed" -msgstr "" - msgctxt "#30055" msgid "Input > D-Pad Mouse Speed" msgstr "" @@ -455,3 +451,19 @@ msgstr "" msgctxt "#30107" msgid "System > Printer" msgstr "" + +msgctxt "#30108" +msgid "Media > Floppy MultiDrive" +msgstr "" + +msgctxt "#30109" +msgid "Video > Automatic Crop Delay" +msgstr "" + +msgctxt "#30110" +msgid "Input > Left Analog Stick Mouse Speed" +msgstr "" + +msgctxt "#30111" +msgid "Input > Right Analog Stick Mouse Speed" +msgstr "" diff --git a/game.libretro.vice_xcbm5x0/resources/settings.xml b/game.libretro.vice_xcbm5x0/resources/settings.xml index 0310ff8..cd666d4 100644 --- a/game.libretro.vice_xcbm5x0/resources/settings.xml +++ b/game.libretro.vice_xcbm5x0/resources/settings.xml @@ -10,12 +10,14 @@ + + @@ -55,7 +57,8 @@ - + +