diff --git a/.gitignore b/.gitignore index 1dfd2a2a..28935b75 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,11 @@ Debug/src/**/*.o Debug/voxel_engine +out/ /build +CMakeLists.txt + /world /worlds/**/* /settings.toml diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..dd3a2140 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/libspng"] + path = libs/libspng + url = https://github.com/randy408/libspng.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bef1499..257ac227 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) \ No newline at end of file