Submodule for JSON added.
Menu data and menu in their own folder.
This commit is contained in:
parent
27c571a6b9
commit
9142896237
12 changed files with 106 additions and 60 deletions
|
|
@ -27,8 +27,8 @@ set(SOURCE_HEADERS
|
|||
include/characteristic/adresse.hpp
|
||||
include/characteristic/endurance.hpp
|
||||
include/characteristic/chance.hpp
|
||||
include/gui/menu.hpp
|
||||
)
|
||||
include/gui/menu/menu.hpp
|
||||
include/gui/menu/menu_data.hpp)
|
||||
|
||||
set(SOURCE_FILES
|
||||
src/imgui/imgui.cpp
|
||||
|
|
@ -45,7 +45,7 @@ set(SOURCE_FILES
|
|||
src/characteristic/adresse.cpp
|
||||
src/characteristic/endurance.cpp
|
||||
src/characteristic/chance.cpp
|
||||
src/gui/menu.cpp
|
||||
src/gui/menu/menu.cpp
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
|
|
@ -79,6 +79,9 @@ option(SPDLOG_NO_TLS "prevent spdlog from using thread local storage" ON)
|
|||
option(SPDLOG_NO_ATOMIC_LEVELS "prevent spdlog from using of std::atomic log levels (use only if your code never modifies log levels concurrently" ON)
|
||||
add_subdirectory(external/spdlog)
|
||||
|
||||
set(JSON_BuildTests OFF CACHE INTERNAL "")
|
||||
add_subdirectory(external/json)
|
||||
|
||||
set(COMPILE_FLAGS
|
||||
-pipe
|
||||
-march=skylake # change to native or your architecture.
|
||||
|
|
@ -142,4 +145,4 @@ target_link_options(BillySheet PRIVATE ${LINKER_OPTIONS})
|
|||
|
||||
target_link_libraries(spdlog PRIVATE ${LINKER_FLAGS})
|
||||
target_link_libraries(glfw PRIVATE ${LINKER_FLAGS})
|
||||
target_link_libraries(BillySheet glfw spdlog OpenGL::OpenGL ${LINKER_FLAGS})
|
||||
target_link_libraries(BillySheet glfw spdlog OpenGL::OpenGL nlohmann_json::nlohmann_json ${LINKER_FLAGS})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue