Use full paths to imgui files in includes
This commit is contained in:
parent
381e0d075a
commit
c7fe85413a
|
@ -1,3 +1,3 @@
|
|||
[submodule "imgui"]
|
||||
path = imgui
|
||||
path = thirdparty/imgui
|
||||
url = https://github.com/ocornut/imgui.git
|
||||
|
|
|
@ -21,17 +21,18 @@ set(INCLUDES "")
|
|||
set(SOURCES "")
|
||||
set(IMGUI_SOURCES "")
|
||||
set(DEFINITIONS "")
|
||||
list(APPEND INCLUDES imgui imgui/backends imgui/misc/cpp imgui/freetype /usr/include/SDL2)
|
||||
# imgui include because <GH ISSUE LINK HERE>
|
||||
list(APPEND INCLUDES thirdparty thirdparty/imgui /usr/include/SDL2)
|
||||
list(APPEND SOURCES main.cpp event_loop.cpp logcat_thread.cpp logcat_entry.cpp log.cpp config.cpp filters.cpp misc.cpp pcre2_wrapper.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
|
||||
imgui/misc/cpp/imgui_stdlib.cpp imgui/misc/freetype/imgui_freetype.cpp
|
||||
imgui/backends/imgui_impl_sdl2.cpp imgui/backends/imgui_impl_opengl3.cpp)
|
||||
list(APPEND DEFINITIONS -DIMGUI_USER_CONFIG="../myimconfig.h")
|
||||
list(APPEND IMGUI_SOURCES thirdparty/imgui/imgui.cpp thirdparty/imgui/imgui_draw.cpp thirdparty/imgui/imgui_widgets.cpp thirdparty/imgui/imgui_tables.cpp
|
||||
thirdparty/imgui/misc/cpp/imgui_stdlib.cpp thirdparty/imgui/misc/freetype/imgui_freetype.cpp
|
||||
thirdparty/imgui/backends/imgui_impl_sdl2.cpp thirdparty/imgui/backends/imgui_impl_opengl3.cpp)
|
||||
list(APPEND DEFINITIONS -DIMGUI_USER_CONFIG="../../myimconfig.h")
|
||||
|
||||
if (CMAKE_BUILD_TYPE MATCHES "Debug")
|
||||
list(APPEND SOURCES windows/debug.cpp)
|
||||
list(APPEND IMGUI_SOURCES imgui/imgui_demo.cpp)
|
||||
list(APPEND IMGUI_SOURCES thirdparty/imgui/imgui_demo.cpp)
|
||||
if (NOT FLAGS)
|
||||
list(APPEND FLAGS -fsanitize=undefined,thread)
|
||||
endif()
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
|
||||
#include "log.h"
|
||||
#include "config.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "logcat_thread.h"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include <imgui.h>
|
||||
#include <imgui_stdlib.h>
|
||||
#include <imgui/imgui.h>
|
||||
#include <imgui/misc/cpp/imgui_stdlib.h>
|
||||
|
||||
#include "../group_panel.h"
|
||||
#include "../filters.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
#include "../misc.h"
|
||||
|
||||
void ok_buttons_fragment(bool* p_open, auto ok, auto apply);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#define IMGUI_DEFINE_MATH_OPERATORS
|
||||
#include <imgui.h>
|
||||
#include <imgui_internal.h>
|
||||
#include <imgui/imgui.h>
|
||||
#include <imgui/imgui_internal.h>
|
||||
#include "group_panel.h"
|
||||
|
||||
// The following code is slightly modified public domain code from https://github.com/thedmd
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
|
||||
// The following code is slightly modified public domain code from https://github.com/thedmd
|
||||
// All modifications have an inline comment with "[CUSTOM]"
|
||||
|
|
6
main.cpp
6
main.cpp
|
@ -3,9 +3,9 @@
|
|||
#include <locale.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui_impl_sdl2.h>
|
||||
#include <imgui_impl_opengl3.h>
|
||||
#include <imgui/imgui.h>
|
||||
#include <imgui/backends/imgui_impl_sdl2.h>
|
||||
#include <imgui/backends/imgui_impl_opengl3.h>
|
||||
#include <SDL.h>
|
||||
#if defined(IMGUI_IMPL_OPENGL_ES2)
|
||||
#include <SDL_opengles2.h>
|
||||
|
|
4
misc.cpp
4
misc.cpp
|
@ -1,8 +1,8 @@
|
|||
#include <iomanip>
|
||||
#include <sstream>
|
||||
#include <system_error>
|
||||
#include <imgui.h>
|
||||
#include <imgui_internal.h>
|
||||
#include <imgui/imgui.h>
|
||||
#include <imgui/imgui_internal.h>
|
||||
|
||||
#include "misc.h"
|
||||
|
||||
|
|
2
misc.h
2
misc.h
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
|
||||
std::string quote(const std::string& str);
|
||||
void throw_system_error(int err, const char* what);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <imgui.cpp>
|
||||
#include <imgui/imgui.cpp>
|
||||
#include "../myimconfig.h"
|
||||
|
||||
#include "../log.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
|
||||
#include "../misc.h"
|
||||
#include "../fragments/filters.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
|
||||
#include "../misc.h"
|
||||
#include "../fragments/filters.h"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include <ctime>
|
||||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
|
||||
#include "../misc.h"
|
||||
#include "../log.h"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#pragma once
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
|
||||
void logs_window(ImFont* monospace_font, bool* __restrict autoscrolling, bool* __restrict p_open);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
#include <ctime>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui/imgui.h>
|
||||
#include <vector>
|
||||
|
||||
#include "../config.h"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include <imgui.h>
|
||||
#include <imgui_stdlib.h>
|
||||
#include <imgui/imgui.h>
|
||||
#include <imgui/misc/cpp/imgui_stdlib.h>
|
||||
|
||||
#include "../misc.h"
|
||||
#include "../config.h"
|
||||
|
|
Loading…
Reference in New Issue