Skip to content

Commit

Permalink
Updated by kodi-game-scripting
Browse files Browse the repository at this point in the history
  • Loading branch information
garbear committed Jan 14, 2024
1 parent 99afac0 commit 9a30db1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "windows-i686", "windows-x86_64"])
buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"])
7 changes: 6 additions & 1 deletion depends/common/dosbox-core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
elseif(CORE_SYSTEM_NAME STREQUAL linux)
set(BUILD_COMMAND $(MAKE) -C libretro -f Makefile.libretro BUNDLED_SDL=1 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
elseif(CORE_SYSTEM_NAME STREQUAL osx)
set(BUILD_COMMAND $(MAKE) -C libretro -f Makefile.libretro BUNDLED_SDL=1 platform=osx ${LIBRETRO_DEBUG} GIT_VERSION=)
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=)
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})
Expand Down
15 changes: 7 additions & 8 deletions depends/windows/mingw/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
cmake_minimum_required(VERSION 3.5)
project(mingw)

# TODO: Upload msys2 packages to mirrors
#foreach(repo msys mingw32 mingw64)
# if(${repo} STREQUAL msys)
# file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}2/$arch\n")
# else()
# file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n")
# endif()
#endforeach()
foreach(repo msys mingw32 mingw64)
if(${repo} STREQUAL msys)
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}2/$arch\n")
else()
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n")
endif()
endforeach()

include(CheckSymbolExists)
check_symbol_exists(_X86_ "Windows.h" _X86_)
Expand Down
2 changes: 1 addition & 1 deletion depends/windows/mingw/mingw.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mingw https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20231026.tar.xz
mingw http://mirrors.kodi.tv/build-deps/win32/msys2/msys2-base-x86_64-20231026.tar.xz
2 changes: 1 addition & 1 deletion game.libretro.dosbox-core/addon.xml.in
Original file line number Diff line number Diff line change
@@ -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.17"
version="4482.0.0.18"
provider-name="DOSBox Team, radius, Nikos Chantziaras">
<requires>
<import addon="game.libretro" version="1.0.0"/>
Expand Down

0 comments on commit 9a30db1

Please sign in to comment.