39 lines
1.4 KiB
Plaintext
39 lines
1.4 KiB
Plaintext
From 39f8d902303ec6bcdccf2f06ebf836f48ee0f880 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Thu, 1 Jul 2021 19:32:05 +1000
|
|
Subject: Fixes for Haiku
|
|
|
|
|
|
diff --git a/backends/imgui_impl_opengl2.cpp b/backends/imgui_impl_opengl2.cpp
|
|
index e56e87d..068b2fa 100644
|
|
--- a/backends/imgui_impl_opengl2.cpp
|
|
+++ b/backends/imgui_impl_opengl2.cpp
|
|
@@ -47,9 +47,9 @@
|
|
#endif
|
|
#if defined(__APPLE__)
|
|
#define GL_SILENCE_DEPRECATION
|
|
-#include <OpenGL/gl.h>
|
|
+#include <glad/glad.h>
|
|
#else
|
|
-#include <GL/gl.h>
|
|
+#include <glad/glad.h>
|
|
#endif
|
|
|
|
// OpenGL Data
|
|
diff --git a/backends/imgui_impl_sdl.cpp b/backends/imgui_impl_sdl.cpp
|
|
index bf273ac..77f8caa 100644
|
|
--- a/backends/imgui_impl_sdl.cpp
|
|
+++ b/backends/imgui_impl_sdl.cpp
|
|
@@ -251,7 +251,7 @@ static void ImGui_ImplSDL2_UpdateMousePosAndButtons()
|
|
io.MouseDown[2] = g_MousePressed[2] || (mouse_buttons & SDL_BUTTON(SDL_BUTTON_MIDDLE)) != 0;
|
|
g_MousePressed[0] = g_MousePressed[1] = g_MousePressed[2] = false;
|
|
|
|
-#if SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IOS)
|
|
+#if SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) && !defined(__HAIKU__) && !(defined(__APPLE__) && TARGET_OS_IOS)
|
|
SDL_Window* focused_window = SDL_GetKeyboardFocus();
|
|
if (g_Window == focused_window)
|
|
{
|
|
--
|
|
2.30.2
|
|
|