Remove GLFW mouse passthrough hack and increase GLFW version in CMake (#3852)
This commit is contained in:
parent
449f7d3fa6
commit
dc1cec8bab
@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
if(USE_EXTERNAL_GLFW STREQUAL "ON")
|
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")
|
elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE")
|
||||||
find_package(glfw3 3.3.3 QUIET)
|
find_package(glfw3 3.4 QUIET)
|
||||||
endif()
|
endif()
|
||||||
if (glfw3_FOUND)
|
if (glfw3_FOUND)
|
||||||
set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw)
|
set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw)
|
||||||
|
@ -84,15 +84,6 @@
|
|||||||
#include "GLFW/glfw3native.h" // Required for: glfwGetCocoaWindow()
|
#include "GLFW/glfw3native.h" // Required for: glfwGetCocoaWindow()
|
||||||
#endif
|
#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
|
// Types and Structures Definition
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user