This commit is contained in:
Denis Sova 2023-12-02 21:45:44 +03:00
parent 92d2d6e19d
commit ba5a2e3661
3 changed files with 11 additions and 3 deletions

3
.gitignore vendored
View File

@ -3,8 +3,11 @@ Debug/src/**/*.o
Debug/voxel_engine
out/
/build
CMakeLists.txt
/world
/worlds/**/*
/settings.toml

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "libs/libspng"]
path = libs/libspng
url = https://github.com/randy408/libspng.git

View File

@ -21,10 +21,12 @@ endif()
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
find_package(OpenAL REQUIRED)
find_package(GLFW3 REQUIRED)
find_package(ZLIB REQUIRED)
if (WIN32)
set(PNGLIB spng)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/libspng)
else()
find_package(PNG REQUIRED)
set(PNGLIB PNG::PNG)
@ -42,6 +44,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
endif()
target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB})
target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB} spng ZLIB::ZLIB)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})