zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-18 01:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- forgot to update the vcpkg/findzmusic stuff with the new build script

Browse source
This commit is contained in:
Rachael Alexanderson 2024-01-31 21:11:03 -05:00
parent 8b6010fc3a
commit fba13f2301
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/FindZMusic.cmake
View file

@ -10,9 +10,15 @@ if(ZMUSIC_INCLUDE_DIR AND ZMUSIC_LIBRARIES)
set(ZMUSIC_FIND_QUIETLY TRUE) set(ZMUSIC_FIND_QUIETLY TRUE)
endif() endif()
find_path(ZMUSIC_INCLUDE_DIR zmusic.h) find_path(ZMUSIC_INCLUDE_DIR zmusic.h
HINTS
${CMAKE_SOURCE_DIR}/build/zmusic/include
)
find_library(ZMUSIC_LIBRARIES NAMES zmusiclite) find_library(ZMUSIC_LIBRARIES NAMES zmusiclite
HINTS
${CMAKE_SOURCE_DIR}/build/zmusic/build/source
)
mark_as_advanced(ZMUSIC_LIBRARIES ZMUSIC_INCLUDE_DIR) mark_as_advanced(ZMUSIC_LIBRARIES ZMUSIC_INCLUDE_DIR)
# handle the QUIETLY and REQUIRED arguments and set ZMUSIC_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set ZMUSIC_FOUND to TRUE if

28
vcpkg.json
View file

@ -1,6 +1,6 @@
{ {
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"builtin-baseline": "65c013b9667ff1f58fb8724209227e5a2e761043", "builtin-baseline": "2c401863dd54a640aeb26ed736c55489c079323b",
"features": "features":
{ {
"vcpkg-libvpx": "vcpkg-libvpx":
@ -10,7 +10,7 @@
{ {
"name": "libvpx", "name": "libvpx",
"default-features": false, "default-features": false,
"platform": "windows & static & staticcrt" "platform": "(!windows & static) | (windows & static & staticcrt)"
} }
] ]
}, },
@ -21,31 +21,35 @@
{ {
"name": "openal-soft", "name": "openal-soft",
"default-features": false, "default-features": false,
"platform": "!windows | (windows & static & staticcrt)" "platform": "(!windows & static) | (windows & static & staticcrt)"
} }
] ]
} }
}, },
"dependencies": [ "dependencies": [
{
"name": "zlib",
"platform": "!windows | (windows & static & staticcrt)"
},
{ {
"name": "bzip2", "name": "bzip2",
"platform": "!windows | (windows & static & staticcrt)" "platform": "(!windows & static) | (windows & static & staticcrt)"
}, },
{ {
"name": "sdl2", "name": "sdl2",
"platform": "!windows & !osx" "platform": "!windows & !osx & static"
}, },
{ {
"name": "libvpx", "name": "libvpx",
"platform": "!windows" "platform": "!windows & static"
}, },
{ {
"name": "libwebp", "name": "libwebp",
"platform": "!windows | (windows & static & staticcrt)" "platform": "(!windows & static) | (windows & static & staticcrt)"
} },
{
"name": "gtk3",
"platform": "!windows & !osx & static"
},
{
"name": "glib",
"platform": "!windows & !osx & static"
}
] ]
} }