PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Revert "Lol"

Browse Source 
This reverts commit ba5a2e3661.
This commit is contained in:
Denis Sova
2023-12-02 21:49:49 +03:00
parent ba5a2e3661
commit 06256abe79
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-3
View File
@@ -3,11 +3,8 @@ Debug/src/**/*.o
Debug/voxel_engine Debug/voxel_engine
out/
/build /build
CMakeLists.txt
/world /world
/worlds/**/* /worlds/**/*
/settings.toml /settings.toml
.gitmodules
-3
View File
@@ -1,3 +0,0 @@
[submodule "libs/libspng"]
path = libs/libspng
url = https://github.com/randy408/libspng.git
CMakeLists.txt
+2 -4
View File
@@ -21,12 +21,10 @@ endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(GLFW3 REQUIRED)
find_package(ZLIB REQUIRED)
if (WIN32) if (WIN32)
set(PNGLIB spng) set(PNGLIB spng)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/libspng) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
else() else()
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
set(PNGLIB PNG::PNG) set(PNGLIB PNG::PNG)
@@ -44,6 +42,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
endif() 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}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})