Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ ext/imgui/docs/
ext/imgui/examples/
ext/imgui/misc/
ext/imgui/.*
_codeql_build_dir/
7 changes: 4 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "ext/glfw"]
path = ext/glfw
url = https://github.com/glfw/glfw
[submodule "ext/imgui"]
path = ext/imgui
url = https://github.com/ocornut/imgui
Expand All @@ -10,3 +7,7 @@
[submodule "ext/mdlib"]
path = ext/mdlib
url = https://github.com/scanberg/mdlib
[submodule "ext/SDL"]
path = ext/SDL
url = https://github.com/libsdl-org/SDL.git
branch = main
25 changes: 10 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,13 @@ else()
set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>)
endif()

# GLFW OPTIONS
option(GLFW_BUILD_EXAMPLES OFF)
option(GLFW_BUILD_TESTS OFF)
option(GLFW_BUILD_DOCS OFF)
option(GLFW_INSTALL OFF)
option(GLFW_VULKAN_STATIC OFF)

if (UNIX AND NOT APPLE)
option(GLFW_BUILD_WAYLAND OFF)
endif()
# SDL3 OPTIONS
set(SDL_SHARED OFF CACHE BOOL "" FORCE)
set(SDL_STATIC ON CACHE BOOL "" FORCE)
set(SDL_TEST_LIBRARY OFF CACHE BOOL "" FORCE)
set(SDL3_DISABLE_INSTALL ON CACHE BOOL "" FORCE)
set(SDL_X11_XSCRNSAVER OFF CACHE BOOL "" FORCE)
set(SDL_X11_XTEST OFF CACHE BOOL "" FORCE)

# ENKI OPTIONS
option(ENKITS_BUILD_C_INTERFACE OFF)
Expand Down Expand Up @@ -71,9 +68,8 @@ endif()
find_package(OpenGL REQUIRED)

add_subdirectory(ext/mdlib)
add_subdirectory(ext/glfw)
add_subdirectory(ext/SDL)
add_subdirectory(ext/imgui)
add_subdirectory(ext/nativefiledialog)
add_subdirectory(ext/stb)
add_subdirectory(ext/enkiTS)
add_subdirectory(ext/ImGuiColorTextEdit)
Expand All @@ -95,7 +91,7 @@ if (VIAMD_LINK_STDLIB_STATIC)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(VIAMD_STDLIBS "-static-libgcc -static-libstdc++")
endif()
set(glfw_LIBRARIES ${VIAMD_STDLIBS})
set(SDL3_LIBRARIES ${VIAMD_STDLIBS})
endif()

if (CMAKE_C_COMPILER_ID STREQUAL "GNU") # GCC
Expand Down Expand Up @@ -217,9 +213,8 @@ set_target_properties(viamd PROPERTIES

target_link_options(viamd PRIVATE ${VIAMD_LINK_FLAGS} $<$<CONFIG:Debug>:${VIAMD_LINK_FLAGS_DEB}> $<$<CONFIG:Release>:${VIAMD_LINK_FLAGS_REL}>)
target_link_libraries(viamd
glfw
SDL3::SDL3-static
imgui
nativefiledialog
mdlib
stb
enkiTS
Expand Down
1 change: 1 addition & 0 deletions _codeql_detected_source_root
1 change: 1 addition & 0 deletions ext/SDL
Submodule SDL added at f0d958
1 change: 0 additions & 1 deletion ext/glfw
Submodule glfw deleted from 7b6aea
72 changes: 0 additions & 72 deletions ext/nativefiledialog/CMakeLists.txt

This file was deleted.

16 changes: 0 additions & 16 deletions ext/nativefiledialog/LICENSE

This file was deleted.

180 changes: 0 additions & 180 deletions ext/nativefiledialog/README.md

This file was deleted.

Loading