Forráskód Böngészése

Remove GLFW mouse passthrough hack and increase GLFW version in CMake (#3852)

Alexandre Almeida 1 éve
szülő
commit
dc1cec8bab
2 módosított fájl, 2 hozzáadás és 11 törlés
  1. 2 2
      cmake/GlfwImport.cmake
  2. 0 9
      src/platforms/rcore_desktop.c

+ 2 - 2
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)

+ 0 - 9
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
 //----------------------------------------------------------------------------------