diff --git a/CMakeLists.txt b/CMakeLists.txt index d31fa3a..acdb181 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ list(APPEND SOURCES main.cpp event_loop.cpp logcat_thread.cpp logcat_entry.cpp l group_panel.cpp fragments/filters.cpp windows/logs.cpp windows/settings.cpp windows/filters.cpp windows/exclusions.cpp windows/main.cpp) list(APPEND IMGUI_SOURCES imgui/imgui.cpp imgui/imgui_draw.cpp imgui/imgui_widgets.cpp imgui/imgui_tables.cpp imgui/misc/cpp/imgui_stdlib.cpp imgui/misc/freetype/imgui_freetype.cpp - imgui/backends/imgui_impl_sdl.cpp imgui/backends/imgui_impl_opengl3.cpp) + imgui/backends/imgui_impl_sdl2.cpp imgui/backends/imgui_impl_opengl3.cpp) list(APPEND DEFINITIONS -DIMGUI_USER_CONFIG="../myimconfig.h") if (CMAKE_BUILD_TYPE MATCHES "Debug") @@ -88,7 +88,8 @@ target_include_directories(imgui PRIVATE ${INCLUDES}) target_link_libraries(imgui PRIVATE ${IMGUI_LIBS}) target_compile_definitions(imgui PRIVATE ${DEFINITIONS}) # dear imgui has some fucky wucky with -Wconversion, hence -Wno-conversion -target_compile_options(imgui PRIVATE ${FLAGS} -Wno-conversion) +# it seems like compilers may issue a warning for unknown warnings to ignore +target_compile_options(imgui PRIVATE ${FLAGS} -Wno-unknown-warning-option -Wno-conversion) add_executable(${PROJECT_NAME} ${SOURCES}) set_target_properties(${PROJECT_NAME} diff --git a/group_panel.cpp b/group_panel.cpp index 24c1dfb..ce48c2c 100644 --- a/group_panel.cpp +++ b/group_panel.cpp @@ -1,4 +1,5 @@ #define IMGUI_DEFINE_MATH_OPERATORS +#include #include #include "group_panel.h" diff --git a/imgui b/imgui index d7c8516..752603b 160000 --- a/imgui +++ b/imgui @@ -1 +1 @@ -Subproject commit d7c8516a4b848c0291e3d75b627c0843f515f591 +Subproject commit 752603bc70bc0fc24846f27b816f04c9fc356453 diff --git a/main.cpp b/main.cpp index 071b2e9..0129025 100644 --- a/main.cpp +++ b/main.cpp @@ -4,13 +4,13 @@ #include #include -#include +#include #include #include #if defined(IMGUI_IMPL_OPENGL_ES2) -#include + #include #else -#include + #include #endif #include "log.h"