mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
Added spng support
This commit is contained in:
parent
4f20abe7ea
commit
fb34f603ae
1 changed files with 13 additions and 11 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue