mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-12-16 04:09:39 +00:00
libspng: Update to 0.7.4 and clean up CMake
This commit is contained in:
parent
62a926a0f5
commit
87eb1aff16
1
.gitmodules
vendored
1
.gitmodules
vendored
@ -35,7 +35,6 @@
|
|||||||
[submodule "Externals/libspng/libspng"]
|
[submodule "Externals/libspng/libspng"]
|
||||||
path = Externals/libspng/libspng
|
path = Externals/libspng/libspng
|
||||||
url = https://github.com/randy408/libspng.git
|
url = https://github.com/randy408/libspng.git
|
||||||
branch = v0.7.2
|
|
||||||
shallow = true
|
shallow = true
|
||||||
[submodule "Externals/VulkanMemoryAllocator"]
|
[submodule "Externals/VulkanMemoryAllocator"]
|
||||||
path = Externals/VulkanMemoryAllocator
|
path = Externals/VulkanMemoryAllocator
|
||||||
|
|||||||
18
Externals/libspng/CMakeLists.txt
vendored
18
Externals/libspng/CMakeLists.txt
vendored
@ -1,10 +1,12 @@
|
|||||||
cmake_minimum_required(VERSION 3.0)
|
option(SPNG_SHARED "Build shared lib" OFF)
|
||||||
|
option(SPNG_STATIC "Build static lib" ON)
|
||||||
|
option(BUILD_EXAMPLES "Build examples" OFF)
|
||||||
|
|
||||||
project(spng C)
|
set(_PREV_CMAKE_SKIP_INSTALL_RULES "${CMAKE_SKIP_INSTALL_RULES}")
|
||||||
|
set(CMAKE_SKIP_INSTALL_RULES TRUE)
|
||||||
|
|
||||||
add_library(spng STATIC libspng/spng/spng.c)
|
add_subdirectory(libspng)
|
||||||
target_compile_definitions(spng PUBLIC SPNG_STATIC)
|
|
||||||
target_link_libraries(spng PUBLIC ZLIB::ZLIB)
|
set(CMAKE_SKIP_INSTALL_RULES "${_PREV_CMAKE_SKIP_INSTALL_RULES}")
|
||||||
target_include_directories(spng PUBLIC libspng/spng)
|
|
||||||
dolphin_disable_warnings(spng)
|
add_library(spng::spng ALIAS spng_static)
|
||||||
add_library(spng::spng ALIAS spng)
|
|
||||||
|
|||||||
2
Externals/libspng/libspng
vendored
2
Externals/libspng/libspng
vendored
@ -1 +1 @@
|
|||||||
Subproject commit dc5b1032c08efac68ad30170f7ccbf0aa8dd55c9
|
Subproject commit fb768002d4288590083a476af628e51c3f1d47cd
|
||||||
Loading…
Reference in New Issue
Block a user