Skip to content

Commit

Permalink
Update dependencies test (todo remove)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcm93 committed Feb 19, 2025
1 parent 9f9d296 commit c9326e0
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/build_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions deps.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion ruby/cmake/os-macos.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ target_link_libraries(
if(SDL_FOUND)
target_link_libraries(
ruby
PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>"
PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>"
# "$<$<BOOL:${SDL_FOUND}>:SDL::SDL>"
)
endif()
Expand Down
1 change: 1 addition & 0 deletions thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ target_compile_options(ymfm PRIVATE $<$<CXX_COMPILER_ID:Clang,AppleClang>:-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 "")
Expand Down

0 comments on commit c9326e0

Please sign in to comment.