diff --git a/.gitignore b/.gitignore index 28935b75..1dfd2a2a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,8 @@ Debug/src/**/*.o Debug/voxel_engine -out/ /build -CMakeLists.txt - /world /worlds/**/* /settings.toml diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index dd3a2140..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libs/libspng"] - path = libs/libspng - url = https://github.com/randy408/libspng.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 257ac227..1bef1499 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,12 +21,10 @@ 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/libspng) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) else() find_package(PNG REQUIRED) set(PNGLIB PNG::PNG) @@ -44,6 +42,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() -target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB} spng ZLIB::ZLIB) +target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file +file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})