Revert "Lol"
This reverts commit ba5a2e3661481fd3cb13f7ca9486555cd92fdcf9.
This commit is contained in:
parent
ba5a2e3661
commit
06256abe79
3
.gitignore
vendored
3
.gitignore
vendored
@ -3,11 +3,8 @@ Debug/src/**/*.o
|
||||
|
||||
Debug/voxel_engine
|
||||
|
||||
out/
|
||||
/build
|
||||
|
||||
CMakeLists.txt
|
||||
|
||||
/world
|
||||
/worlds/**/*
|
||||
/settings.toml
|
||||
|
||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
||||
[submodule "libs/libspng"]
|
||||
path = libs/libspng
|
||||
url = https://github.com/randy408/libspng.git
|
||||
@ -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})
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user