File tree Expand file tree Collapse file tree 4 files changed +18
-13
lines changed Expand file tree Collapse file tree 4 files changed +18
-13
lines changed Original file line number Diff line number Diff line change @@ -32,11 +32,17 @@ endif()
3232
3333if (CORE_SYSTEM_NAME STREQUAL windows)
3434 find_package (MinGW REQUIRED)
35- if (CPU STREQUAL arm64)
35+
36+ if (MINGW_MAKE MATCHES "/mingw64/" )
3637 set (MSYSTEM MINGW64)
37- else ( )
38+ elseif (MINGW_MAKE MATCHES "/mingw32/" )
3839 set (MSYSTEM MINGW32)
40+ else ()
41+ message (FATAL_ERROR "Unknown MinGW flavor in MINGW_MAKE: ${MINGW_MAKE} " )
3942 endif ()
43+
44+ message (STATUS "Using ${MSYSTEM} (from MINGW_MAKE='${MINGW_MAKE} ')" )
45+
4046 set (BUILD_COMMAND ${MINGW_MAKE}
4147 -C .
4248 -f Makefile
Original file line number Diff line number Diff line change 11cmake_minimum_required (VERSION 3.5)
22project (mingw)
33
4- # TODO: Upload msys2 packages to mirrors
5- #foreach(repo msys mingw32 mingw64)
6- # if(${repo} STREQUAL msys)
7- # 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")
8- # else()
9- # file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n")
10- # endif()
11- #endforeach()
4+ foreach (repo msys mingw32 mingw64)
5+ if (${repo} STREQUAL msys)
6+ 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 " )
7+ else ()
8+ file (WRITE ${CMAKE_CURRENT_SOURCE_DIR} /etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo} \n " )
9+ endif ()
10+ endforeach ()
1211
1312include (CheckSymbolExists)
1413check_symbol_exists(_X86_ "Windows.h" _X86_)
2928endif ()
3029
3130execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR} /usr/bin/bash.exe --login -c "pacman-key --init" ERROR_QUIET)
32- execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR} /usr/bin/bash.exe --login -c "pacman --noconfirm -S make ${HOST} -gcc" )
31+ execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR} /usr/bin/bash.exe --login -c "pacman --noconfirm -S make ${HOST} -gcc nasm " )
3332
3433file (GLOB_RECURSE shared_libs ${CMAKE_CURRENT_SOURCE_DIR} /${MINGW_PATH} /*.dll.a)
3534file (REMOVE ${shared_libs} )
Original file line number Diff line number Diff line change 1- mingw https ://repo.msys2.org/distrib/x86_64 /msys2-base-x86_64-20250622.tar.xz
1+ mingw http ://mirrors.kodi.tv/build-deps/win32/msys2 /msys2-base-x86_64-20250622.tar.xz
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" UTF-8" ?>
22<addon id =" game.libretro.3dengine"
33 name=" Test Core - 3D Engine"
4- version=" 1.0.0.29 "
4+ version=" 1.0.0.30 "
55 provider-name=" Team Libretro" >
66 <requires >
77 <import addon =" game.libretro" version =" 1.0.0" />
You can’t perform that action at this time.
0 commit comments