diff options
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CPMUtil.cmake | 13 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 10 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuSDLDeps.cmake | 8 |
3 files changed, 10 insertions, 21 deletions
diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake index 1e954b2dc0..1c4a4874c6 100644 --- a/CMakeModules/CPMUtil.cmake +++ b/CMakeModules/CPMUtil.cmake @@ -586,15 +586,22 @@ function(AddCIPackage) set(ARTIFACT_REPO ${PKG_ARGS_REPO}) set(ARTIFACT_PACKAGE ${PKG_ARGS_PACKAGE}) - # TODO: separate MinGW packages if applicable - if ((WIN32 AND ARCHITECTURE_x86_64) AND NOT "windows-amd64" IN_LIST DISABLED_PLATFORMS) + if ((MSVC AND ARCHITECTURE_x86_64) AND NOT "windows-amd64" IN_LIST DISABLED_PLATFORMS) add_ci_package(windows-amd64) endif() - if ((WIN32 AND ARCHITECTURE_arm64) AND NOT "windows-arm64" IN_LIST DISABLED_PLATFORMS) + if ((MSVC AND ARCHITECTURE_arm64) AND NOT "windows-arm64" IN_LIST DISABLED_PLATFORMS) add_ci_package(windows-arm64) endif() + if ((MINGW AND ARCHITECTURE_x86_64) AND NOT "mingw-amd64" IN_LIST DISABLED_PLATFORMS) + add_ci_package(mingw-amd64) + endif() + + if ((MINGW AND ARCHITECTURE_arm64) AND NOT "mingw-arm64" IN_LIST DISABLED_PLATFORMS) + add_ci_package(mingw-arm64) + endif() + if (ANDROID AND NOT "android" IN_LIST DISABLED_PLATFORMS) add_ci_package(android) endif() diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake deleted file mode 100644 index e50696cc02..0000000000 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-FileCopyrightText: 2020 yuzu Emulator Project -# SPDX-License-Identifier: GPL-2.0-or-later - -function(copy_yuzu_FFmpeg_deps target_dir) - include(WindowsCopyFiles) - set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") - file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) - string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) - windows_copy_files(${target_dir} ${FFmpeg_LIBRARY_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) -endfunction(copy_yuzu_FFmpeg_deps) diff --git a/CMakeModules/CopyYuzuSDLDeps.cmake b/CMakeModules/CopyYuzuSDLDeps.cmake deleted file mode 100644 index 464eed5e9c..0000000000 --- a/CMakeModules/CopyYuzuSDLDeps.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: 2016 Citra Emulator Project -# SPDX-License-Identifier: GPL-2.0-or-later - -function(copy_yuzu_SDL_deps target_dir) - include(WindowsCopyFiles) - set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") - windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) -endfunction(copy_yuzu_SDL_deps) |