From fb34f603aee2e90cdbda7e7bd8bc72234f6eb353 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 24 Oct 2023 09:10:42 +0300 Subject: [PATCH] Added spng support --- CMakeLists.txt | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73978c3a..2b8654f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES}) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) if(MSVC) - target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX) + target_compile_options(${PROJECT_NAME} PRIVATE /W4) else() target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra) endif() @@ -18,17 +18,19 @@ option(VE_USE_SYSTEM_LIBS "Use system installed libraries" ON) find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) find_package(OpenAL REQUIRED) -find_package(PNG REQUIRED) + +if (WIN32) + set(PNGLIB spng) +else() + find_package(PNG REQUIRED) + set(PNGLIB PNG::PNG) +endif(WIN32) set(LIBS "") -if(NOT VE_USE_SYSTEM_LIBS) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glm) - set(LIBS glm) -else() - find_package(glfw3 REQUIRED) - find_package(glm REQUIRED) -endif(NOT VE_USE_SYSTEM_LIBS) + +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glm) +set(LIBS glm) if(UNIX) find_package(Threads REQUIRED) @@ -36,6 +38,6 @@ if(UNIX) endif(UNIX) -target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW PNG::PNG) +target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW spng) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/build)