maelstrom/openblocks
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: remove unused dependencies

Browse source
This commit is contained in:
maelstrom 2025-03-12 22:47:59 +01:00
parent 7e6261fcf3
commit 086a2ca39f
5 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5.0) cmake_minimum_required(VERSION 3.31..)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
project(openblocks VERSION 0.1.0) project(openblocks VERSION 0.1.0)
set(OpenGL_GL_PREFERENCE "GLVND") set(OpenGL_GL_PREFERENCE "GLVND")

5
client/CMakeLists.txt
View file

@ -1,4 +1,7 @@
find_package(SDL2 REQUIRED)
include_directories(${SDL2_INCLUDE_DIRS})
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)
add_executable(client "src/main.cpp") add_executable(client "src/main.cpp")
target_link_libraries(client PRIVATE openblocks glfw) target_link_libraries(client PRIVATE ${SDL2_LIBRARIES} openblocks glfw)

9
core/CMakeLists.txt
View file

@ -1,22 +1,15 @@
find_package(OpenGL REQUIRED COMPONENTS OpenGL) find_package(OpenGL REQUIRED COMPONENTS OpenGL)
find_package(SDL2 REQUIRED)
include_directories(${SDL2_INCLUDE_DIRS})
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
include_directories(${GLEW_INCLUDE_DIRS}) include_directories(${GLEW_INCLUDE_DIRS})
find_package(GLUT REQUIRED)
include_directories(${GLUT_INCLUDE_DIRS})
find_package(OpenGL) find_package(OpenGL)
find_package(glm CONFIG REQUIRED) find_package(glm CONFIG REQUIRED)
# find_package(assimp REQUIRED)
find_package(ReactPhysics3D REQUIRED) find_package(ReactPhysics3D REQUIRED)
find_package(pugixml REQUIRED) find_package(pugixml REQUIRED)
file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.h") file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.h")
add_library(openblocks ${SOURCES}) add_library(openblocks ${SOURCES})
set_target_properties(openblocks PROPERTIES OUTPUT_NAME "openblocks") set_target_properties(openblocks PROPERTIES OUTPUT_NAME "openblocks")
target_link_libraries(openblocks ${SDL2_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} OpenGL::GL OpenGL::GLU ReactPhysics3D::ReactPhysics3D pugixml::pugixml) target_link_libraries(openblocks ${GLEW_LIBRARIES} OpenGL::GL ReactPhysics3D::ReactPhysics3D pugixml::pugixml)
target_include_directories(openblocks PUBLIC "src" "../include") target_include_directories(openblocks PUBLIC "src" "../include")

9
deps.txt
View file

@ -1,10 +1,9 @@
glm opengl (Linux: glvnd, Windows: [built-in/none])
opengl
assimp
sdl2
glfw glfw
glut
glew glew
glm
sdl2
stb
qt6 qt6
reactphysics3d reactphysics3d
pugixml pugixml

6
editor/CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.31..)
project(editor VERSION 0.1 LANGUAGES CXX) project(editor VERSION 0.1 LANGUAGES CXX)
@ -14,8 +14,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools)
set(TS_FILES editor_en_US.ts) set(TS_FILES editor_en_US.ts)
set(PROJECT_SOURCES set(PROJECT_SOURCES
@ -98,6 +96,8 @@ install(TARGETS editor
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
) )
install(FILES $<TARGET_RUNTIME_DLLS:editor> TYPE BIN)
if(QT_VERSION_MAJOR EQUAL 6) if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(editor) qt_finalize_executable(editor)
endif() endif()