diff options
| author | Alexandre Almeida <[email protected]> | 2024-03-01 04:34:53 -0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-03-01 08:34:53 +0100 |
| commit | dc1cec8bab97e09656479bded3265fb420a0b073 (patch) | |
| tree | 1884bb182cf47f2c00801e3a837a81655d96965f | |
| parent | 449f7d3fa68283ff4accbd9e9f69b672ec0cd7f8 (diff) | |
| download | raylib-dc1cec8bab97e09656479bded3265fb420a0b073.tar.gz raylib-dc1cec8bab97e09656479bded3265fb420a0b073.zip | |
Remove GLFW mouse passthrough hack and increase GLFW version in CMake (#3852)
| -rw-r--r-- | cmake/GlfwImport.cmake | 4 | ||||
| -rw-r--r-- | src/platforms/rcore_desktop.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake index 1c267aba..2395343c 100644 --- a/cmake/GlfwImport.cmake +++ b/cmake/GlfwImport.cmake @@ -1,8 +1,8 @@ if(USE_EXTERNAL_GLFW STREQUAL "ON") - find_package(glfw3 3.3.3 REQUIRED) + find_package(glfw3 3.4 REQUIRED) elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE") - find_package(glfw3 3.3.3 QUIET) + find_package(glfw3 3.4 QUIET) endif() if (glfw3_FOUND) set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) diff --git a/src/platforms/rcore_desktop.c b/src/platforms/rcore_desktop.c index d4c02440..29c85156 100644 --- a/src/platforms/rcore_desktop.c +++ b/src/platforms/rcore_desktop.c @@ -85,15 +85,6 @@ #endif //---------------------------------------------------------------------------------- -// Defines and Macros -//---------------------------------------------------------------------------------- -// TODO: HACK: Added flag if not provided by GLFW when using external library -// Latest GLFW release (GLFW 3.3.8) does not implement this flag, it was added for 3.4.0-dev -#if !defined(GLFW_MOUSE_PASSTHROUGH) - #define GLFW_MOUSE_PASSTHROUGH 0x0002000D -#endif - -//---------------------------------------------------------------------------------- // Types and Structures Definition //---------------------------------------------------------------------------------- typedef struct { |