From c9326e06f93cea550d11cf6501185e0ea20f11f5 Mon Sep 17 00:00:00 2001 From: jcm <6864788+jcm93@users.noreply.github.com> Date: Wed, 19 Feb 2025 12:17:03 -0600 Subject: [PATCH] Update dependencies test (todo remove) --- .github/scripts/build_ubuntu.sh | 2 +- deps.json | 12 ++++++------ ruby/cmake/os-macos.cmake | 2 +- thirdparty/CMakeLists.txt | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/scripts/build_ubuntu.sh b/.github/scripts/build_ubuntu.sh index a0c9733ef..687328ff4 100755 --- a/.github/scripts/build_ubuntu.sh +++ b/.github/scripts/build_ubuntu.sh @@ -2,7 +2,7 @@ set -euo pipefail # configure -cmake --preset $TARGET_PRESET +cmake --preset $TARGET_PRESET --debug-find # change into the build directory pushd build diff --git a/deps.json b/deps.json index 5e34e830c..9195c384b 100644 --- a/deps.json +++ b/deps.json @@ -1,14 +1,14 @@ { "dependencies": { "prebuilt": { - "version": "2024-12-30", - "baseUrl": "https://github.com/ares-emulator/ares-deps/releases/download", + "version": "2025-02-19", + "baseUrl": "https://github.com/jcm93/ares-deps-2/releases/download", "label": "Pre-Built ares-deps", "hashes": { - "linux-universal": "d2a41db4569daf6fc9623d4933c7aa23fc176af13583a3eefbdbab832f0bc781", - "macos-universal": "1373844c53261684c19afc3ab8dec5942638ac21adb00654cbcc636420020a03", - "windows-arm64": "33425aac3151e51d9f1fa54e306ca1efba5af73be2b771890e1c2bc83af4c579", - "windows-x64": "7f1e1a2e7edb6f7344ff9c3913f530319ebb14c55e88da10ed9d4a1cf568daa8" + "linux-universal": "638df2b4736eddd24094d181e56f5495eb665f87a15be0d84b97f14d1af3d896", + "macos-universal": "adb9fc50f1140282c4d6c72b535e86dab99e5915424a1b0c348d099854f903b8", + "windows-arm64": "d7a0b60a7e9c9aa0054a7744da41dce3123b84395b22b07f010098ee8d2bab5b", + "windows-x64": "76b287e35fb7923d265142f086e99bcea74c43f9a6d9d8ae31e998c7bbdf46de" } } }, diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake index 61cc16ee2..3d59072c0 100644 --- a/ruby/cmake/os-macos.cmake +++ b/ruby/cmake/os-macos.cmake @@ -43,7 +43,7 @@ target_link_libraries( if(SDL_FOUND) target_link_libraries( ruby - PRIVATE "$" + PRIVATE "$" # "$<$:SDL::SDL>" ) endif() diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 93e0893d8..277982fd3 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -100,6 +100,7 @@ target_compile_options(ymfm PRIVATE $<$:-Wno-u if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) list(APPEND CMAKE_PREFIX_PATH librashader/include) + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE PATH "CMake prefix search path" FORCE) endif() set_target_properties(ymfm PROPERTIES FOLDER thirdparty PREFIX "")