Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-12 02:00:52 +01:00
Code Releases Wiki Activity

fix: Allow ImHex to build under wayland again

Browse Source
This commit is contained in:
WerWolv 2024-07-24 19:41:34 +02:00
parent 416889f49d
commit 48fc1a7a1e
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libimhex/source/helpers/fs.cpp
View File

@ -23,6 +23,7 @@
#if defined(OS_WEB) #if defined(OS_WEB)
#include <emscripten.h> #include <emscripten.h>
#else #else
#include <GLFW/glfw3.h>
#include <nfd.hpp> #include <nfd.hpp>
#if defined(OS_WINDOWS) #if defined(OS_WINDOWS)
#define GLFW_EXPOSE_NATIVE_WIN32 #define GLFW_EXPOSE_NATIVE_WIN32
@ -36,17 +37,21 @@
#define GLFW_EXPOSE_NATIVE_COCOA #define GLFW_EXPOSE_NATIVE_COCOA
#endif #endif
#if defined(OS_LINUX) #if defined(OS_LINUX)
#if GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 4
#define GLFW_EXPOSE_NATIVE_X11 #define GLFW_EXPOSE_NATIVE_X11
#endif #else
#if defined(OS_LINUX) && defined(GLFW_WAYLAND_APP_ID)
#define GLFW_EXPOSE_NATIVE_WAYLAND #define GLFW_EXPOSE_NATIVE_WAYLAND
#endif #endif
#endif
#include <nfd_glfw3.h> #include <nfd_glfw3.h>
#if defined(OS_LINUX) && defined(GLFW_WAYLAND_APP_ID)
#if defined(OS_LINUX) && GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 4
#if GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 4
#undef GLFW_EXPOSE_NATIVE_X11
#else
#undef GLFW_EXPOSE_NATIVE_WAYLAND #undef GLFW_EXPOSE_NATIVE_WAYLAND
#endif #endif
#if defined(OS_LINUX)
#undef GLFW_EXPOSE_NATIVE_X11
#endif #endif
#if defined(OS_MACOS) #if defined(OS_MACOS)
#undef GLFW_EXPOSE_NATIVE_COCOA #undef GLFW_EXPOSE_NATIVE_COCOA