diff --git a/.gitmodules b/.gitmodules index d33c049..6fe75ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "libraries/BLT"] path = libraries/BLT url = https://github.com/Tri11Paragon/BLT.git +[submodule "libraries/imgui"] + path = libraries/imgui + url = https://github.com/ocornut/imgui diff --git a/CMakeLists.txt b/CMakeLists.txt index 36baacc..a09c3ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,17 +13,26 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) add_subdirectory(libraries/BLT) add_subdirectory(libraries/glfw-3.3.8) +list(APPEND IMGUI_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/imgui.cpp") +list(APPEND IMGUI_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/imgui_demo.cpp") +list(APPEND IMGUI_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/imgui_draw.cpp") +list(APPEND IMGUI_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/imgui_tables.cpp") +list(APPEND IMGUI_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/imgui_widgets.cpp") +list(APPEND IMGUI_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/backends/imgui_impl_opengl3.cpp") +list(APPEND IMGUI_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/backends/imgui_impl_glfw.cpp") + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/) include_directories(include/) file(GLOB_RECURSE PROJECT_BUILD_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") -add_executable(BLT_With_Graphics_Template ${PROJECT_BUILD_FILES}) +add_executable(BLT_With_Graphics_Template ${PROJECT_BUILD_FILES} ${IMGUI_SOURCE_FILES}) target_link_libraries(BLT_With_Graphics_Template glfw) target_link_libraries(BLT_With_Graphics_Template BLT) -target_compile_options(BLT_With_Graphics_Template PRIVATE -Wall -Werror -Wpedantic -Wno-comment) -target_link_options(BLT_With_Graphics_Template PRIVATE -Wall -Werror -Wpedantic -Wno-comment) +target_compile_options(BLT_With_Graphics_Template PRIVATE -Wall -Werror -Wpedantic -Wno-comment -Wno-strict-aliasing) +target_link_options(BLT_With_Graphics_Template PRIVATE -Wall -Werror -Wpedantic -Wno-comment -Wno-strict-aliasing) if (${ENABLE_ADDRSAN} MATCHES ON) target_compile_options(BLT_With_Graphics_Template PRIVATE -fsanitize=address) diff --git a/libraries/imgui b/libraries/imgui new file mode 160000 index 0000000..0d582da --- /dev/null +++ b/libraries/imgui @@ -0,0 +1 @@ +Subproject commit 0d582dabf34e9e31f072b1ee5c353c18351b4424