blankie
/
logmeow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update imgui

This commit is contained in:
blankie 2023-02-16 21:57:42 +07:00
parent 10d81944b7
commit 30e9a4df7d
Signed by: blankie
GPG Key ID: CC15FC822C7F61F5
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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) 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 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/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") list(APPEND DEFINITIONS -DIMGUI_USER_CONFIG="../myimconfig.h")
if (CMAKE_BUILD_TYPE MATCHES "Debug") if (CMAKE_BUILD_TYPE MATCHES "Debug")
@ -88,7 +88,8 @@ target_include_directories(imgui PRIVATE ${INCLUDES})
target_link_libraries(imgui PRIVATE ${IMGUI_LIBS}) target_link_libraries(imgui PRIVATE ${IMGUI_LIBS})
target_compile_definitions(imgui PRIVATE ${DEFINITIONS}) target_compile_definitions(imgui PRIVATE ${DEFINITIONS})
# dear imgui has some fucky wucky with -Wconversion, hence -Wno-conversion # 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}) add_executable(${PROJECT_NAME} ${SOURCES})
set_target_properties(${PROJECT_NAME} set_target_properties(${PROJECT_NAME}

1
group_panel.cpp
View File

@ -1,4 +1,5 @@
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui.h>
#include <imgui_internal.h> #include <imgui_internal.h>
#include "group_panel.h" #include "group_panel.h"

2
imgui

@ -1 +1 @@
Subproject commit d7c8516a4b848c0291e3d75b627c0843f515f591 Subproject commit 752603bc70bc0fc24846f27b816f04c9fc356453

6
main.cpp
View File

@ -4,13 +4,13 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <imgui.h> #include <imgui.h>
#include <imgui_impl_sdl.h> #include <imgui_impl_sdl2.h>
#include <imgui_impl_opengl3.h> #include <imgui_impl_opengl3.h>
#include <SDL.h> #include <SDL.h>
#if defined(IMGUI_IMPL_OPENGL_ES2) #if defined(IMGUI_IMPL_OPENGL_ES2)
#include <SDL_opengles2.h> #include <SDL_opengles2.h>
#else #else
#include <SDL_opengl.h> #include <SDL_opengl.h>
#endif #endif
#include "log.h" #include "log.h"