From 9d7c1369ca0e2e1ceba52f28e4f466d987a356e3 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Sat, 22 Jan 2022 18:13:46 +0100 Subject: [PATCH] Fix bad OpenGL bu --- core/src/gui/icons.h | 5 +---- core/src/gui/widgets/image.h | 5 +---- core/src/gui/widgets/line_push_image.h | 5 +---- core/src/gui/widgets/waterfall.h | 5 +---- core/src/utils/opengl_include_code.h | 10 ++++++++++ 5 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 core/src/utils/opengl_include_code.h diff --git a/core/src/gui/icons.h b/core/src/gui/icons.h index 5cda51f8..4a9f7fce 100644 --- a/core/src/gui/icons.h +++ b/core/src/gui/icons.h @@ -2,10 +2,7 @@ #include #include -#ifdef _WIN32 -#include -#endif -#include +#include namespace icons { extern ImTextureID LOGO; diff --git a/core/src/gui/widgets/image.h b/core/src/gui/widgets/image.h index 4004cd79..77538b70 100644 --- a/core/src/gui/widgets/image.h +++ b/core/src/gui/widgets/image.h @@ -5,10 +5,7 @@ #include #include -#ifdef _WIN32 -#include -#endif -#include +#include namespace ImGui { class ImageDisplay { diff --git a/core/src/gui/widgets/line_push_image.h b/core/src/gui/widgets/line_push_image.h index f8215b9b..46ca4b0a 100644 --- a/core/src/gui/widgets/line_push_image.h +++ b/core/src/gui/widgets/line_push_image.h @@ -5,10 +5,7 @@ #include #include -#ifdef _WIN32 -#include -#endif -#include +#include namespace ImGui { class LinePushImage { diff --git a/core/src/gui/widgets/waterfall.h b/core/src/gui/widgets/waterfall.h index 2212310e..b68a546d 100644 --- a/core/src/gui/widgets/waterfall.h +++ b/core/src/gui/widgets/waterfall.h @@ -6,10 +6,7 @@ #include #include -#ifdef _WIN32 -#include -#endif -#include +#include #define WATERFALL_RESOLUTION 1000000 diff --git a/core/src/utils/opengl_include_code.h b/core/src/utils/opengl_include_code.h new file mode 100644 index 00000000..aa6b1437 --- /dev/null +++ b/core/src/utils/opengl_include_code.h @@ -0,0 +1,10 @@ +#pragma once + +#if defined(_WIN32) +#include +#include +#elif define(__APPLE__) +#include +#else +#include +#endif \ No newline at end of file