diff --git a/lib/libimhex/include/hex/helpers/opengl.hpp b/lib/libimhex/include/hex/helpers/opengl.hpp index eb4d06671..cd41c71ea 100644 --- a/lib/libimhex/include/hex/helpers/opengl.hpp +++ b/lib/libimhex/include/hex/helpers/opengl.hpp @@ -9,13 +9,7 @@ #include #include -#if defined(OS_WEB) - #define GLFW_INCLUDE_ES3 - #include -#else - #include -#endif - +#include #include namespace hex::gl { diff --git a/lib/libimhex/source/helpers/opengl.cpp b/lib/libimhex/source/helpers/opengl.cpp index b59dc145b..5e5cab2d3 100644 --- a/lib/libimhex/source/helpers/opengl.cpp +++ b/lib/libimhex/source/helpers/opengl.cpp @@ -1,16 +1,11 @@ #include +#include #include #include #include -#if defined(OS_WEB) - #define GLFW_INCLUDE_ES3 - #include -#else - #include -#endif namespace hex::gl { diff --git a/lib/libimhex/source/ui/imgui_imhex_extensions.cpp b/lib/libimhex/source/ui/imgui_imhex_extensions.cpp index 252934155..3e2f5540a 100644 --- a/lib/libimhex/source/ui/imgui_imhex_extensions.cpp +++ b/lib/libimhex/source/ui/imgui_imhex_extensions.cpp @@ -1,18 +1,8 @@ #include -#if defined(OS_WEB) - #define IMGL3W_IMPL -#endif - #include #include - -#if defined(OS_WEB) - #define GLFW_INCLUDE_ES3 - #include -#else - #include -#endif +#include #undef IMGUI_DEFINE_MATH_OPERATORS diff --git a/lib/third_party/imgui/custom/include/opengl_support.h b/lib/third_party/imgui/custom/include/opengl_support.h new file mode 100644 index 000000000..7f5458f36 --- /dev/null +++ b/lib/third_party/imgui/custom/include/opengl_support.h @@ -0,0 +1,8 @@ +#pragma once + +#if defined(OS_WEB) + #define GLFW_INCLUDE_ES3 + #include +#else + #include +#endif \ No newline at end of file diff --git a/main/gui/source/init/splash_window.cpp b/main/gui/source/init/splash_window.cpp index de104ef40..beb7da794 100644 --- a/main/gui/source/init/splash_window.cpp +++ b/main/gui/source/init/splash_window.cpp @@ -14,10 +14,14 @@ #include #include #include + #include #include -#include #include +#include + +#include + #include @@ -28,13 +32,6 @@ #include #include -#if defined(OS_WEB) - #define GLFW_INCLUDE_ES3 - #include - #include -#else - #include -#endif using namespace std::literals::chrono_literals; diff --git a/plugins/builtin/source/content/pl_visualizers.cpp b/plugins/builtin/source/content/pl_visualizers.cpp index 135a7bd50..84fd5c987 100644 --- a/plugins/builtin/source/content/pl_visualizers.cpp +++ b/plugins/builtin/source/content/pl_visualizers.cpp @@ -10,13 +10,7 @@ #include #include -#if defined(OS_WEB) - #define GLFW_INCLUDE_ES3 - #include -#else - #include -#endif - +#include #include #include