mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-09 23:59:27 +01:00
Allow building against system libspng
This commit is contained in:
parent
72b22ef0a5
commit
4d164fcb77
@ -800,7 +800,15 @@ else()
|
|||||||
set(LZO lzo2)
|
set(LZO lzo2)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(Externals/libspng)
|
pkg_check_modules(pc_spng IMPORTED_TARGET spng)
|
||||||
|
if (pc_spng_FOUND AND TARGET PkgConfig::pc_spng)
|
||||||
|
message(STATUS "Using the system libspng")
|
||||||
|
set(spng_target PkgConfig::pc_spng)
|
||||||
|
else()
|
||||||
|
message(STATUS "Using static libspng from Externals")
|
||||||
|
add_subdirectory(Externals/libspng)
|
||||||
|
set(spng_target spng)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Using static FreeSurround from Externals
|
# Using static FreeSurround from Externals
|
||||||
# There is no system FreeSurround library.
|
# There is no system FreeSurround library.
|
||||||
|
@ -155,7 +155,7 @@ PRIVATE
|
|||||||
${CURL_LIBRARIES}
|
${CURL_LIBRARIES}
|
||||||
FatFs
|
FatFs
|
||||||
${ICONV_LIBRARIES}
|
${ICONV_LIBRARIES}
|
||||||
spng
|
${spng_target}
|
||||||
${VTUNE_LIBRARIES}
|
${VTUNE_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ PUBLIC
|
|||||||
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
fmt::fmt
|
fmt::fmt
|
||||||
spng
|
${spng_target}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
@ -170,7 +170,7 @@ PUBLIC
|
|||||||
core
|
core
|
||||||
PRIVATE
|
PRIVATE
|
||||||
fmt::fmt
|
fmt::fmt
|
||||||
spng
|
${spng_target}
|
||||||
xxhash
|
xxhash
|
||||||
imgui
|
imgui
|
||||||
implot
|
implot
|
||||||
|
Loading…
x
Reference in New Issue
Block a user