Skip to content

Commit 47192eb

Browse files
committed
Update dependencies test (todo remove)
1 parent 9f9d296 commit 47192eb

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

Diff for: .github/scripts/build_ubuntu.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
# configure
5-
cmake --preset $TARGET_PRESET
5+
cmake --preset $TARGET_PRESET --debug-find
66

77
# change into the build directory
88
pushd build

Diff for: deps.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"dependencies": {
33
"prebuilt": {
4-
"version": "2024-12-30",
5-
"baseUrl": "https://github.com/ares-emulator/ares-deps/releases/download",
4+
"version": "2025-02-19",
5+
"baseUrl": "https://github.com/jcm93/ares-deps-2/releases/download",
66
"label": "Pre-Built ares-deps",
77
"hashes": {
8-
"linux-universal": "d2a41db4569daf6fc9623d4933c7aa23fc176af13583a3eefbdbab832f0bc781",
9-
"macos-universal": "1373844c53261684c19afc3ab8dec5942638ac21adb00654cbcc636420020a03",
10-
"windows-arm64": "33425aac3151e51d9f1fa54e306ca1efba5af73be2b771890e1c2bc83af4c579",
11-
"windows-x64": "7f1e1a2e7edb6f7344ff9c3913f530319ebb14c55e88da10ed9d4a1cf568daa8"
8+
"linux-universal": "638df2b4736eddd24094d181e56f5495eb665f87a15be0d84b97f14d1af3d896",
9+
"macos-universal": "adb9fc50f1140282c4d6c72b535e86dab99e5915424a1b0c348d099854f903b8",
10+
"windows-arm64": "d7a0b60a7e9c9aa0054a7744da41dce3123b84395b22b07f010098ee8d2bab5b",
11+
"windows-x64": "76b287e35fb7923d265142f086e99bcea74c43f9a6d9d8ae31e998c7bbdf46de"
1212
}
1313
}
1414
},

Diff for: ruby/cmake/os-macos.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ target_link_libraries(
4343
if(SDL_FOUND)
4444
target_link_libraries(
4545
ruby
46-
PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>"
46+
PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>"
4747
# "$<$<BOOL:${SDL_FOUND}>:SDL::SDL>"
4848
)
4949
endif()

Diff for: thirdparty/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ target_include_directories(ymfm PUBLIC ../thirdparty/ymfm/src)
9999
target_compile_options(ymfm PRIVATE $<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-unreachable-code>)
100100

101101
if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
102-
list(APPEND CMAKE_PREFIX_PATH librashader/include)
102+
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/thirdparty/librashader/include")
103+
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE PATH "CMake prefix search path" FORCE)
103104
endif()
104105

105106
set_target_properties(ymfm PROPERTIES FOLDER thirdparty PREFIX "")

0 commit comments

Comments
 (0)