From dc1cec8bab97e09656479bded3265fb420a0b073 Mon Sep 17 00:00:00 2001 From: Alexandre Almeida Date: Fri, 1 Mar 2024 04:34:53 -0300 Subject: [PATCH] Remove GLFW mouse passthrough hack and increase GLFW version in CMake (#3852) --- cmake/GlfwImport.cmake | 4 ++-- src/platforms/rcore_desktop.c | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake index 1c267aba7..2395343c7 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 d4c024400..29c85156c 100644 --- a/src/platforms/rcore_desktop.c +++ b/src/platforms/rcore_desktop.c @@ -84,15 +84,6 @@ #include "GLFW/glfw3native.h" // Required for: glfwGetCocoaWindow() #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 //----------------------------------------------------------------------------------