Parcourir la source

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

pull/3859/head
Alexandre Almeida il y a 1 an
committed by GitHub
Parent
révision
dc1cec8bab
Aucune clé connue n'a été trouvée dans la base pour cette signature ID de la clé GPG: B5690EEEBB952194
2 fichiers modifiés avec 2 ajouts et 11 suppressions
  1. +2
    -2
      cmake/GlfwImport.cmake
  2. +0
    -9
      src/platforms/rcore_desktop.c

+ 2
- 2
cmake/GlfwImport.cmake Voir le fichier

@ -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 Voir le fichier

@ -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
//----------------------------------------------------------------------------------

Chargement…
Annuler
Enregistrer