Skip to content

Commit 9e0e08c

Browse files
committed
WARNING: UPDATED GLFW to latest master branch!
WARNING: This could be a BREAKING CHANGE for some platforms! I'm afraid something could be wrong on `rglfw.c` module. To be able to compile on Windows I had to modify `glfw/src/platform.c` line 74. I couldn't manage to compile without that change, help is welcome!
1 parent 8508ae3 commit 9e0e08c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+16763
-10166
lines changed

src/external/glfw/CMake/GenerateMappings.cmake

+17-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,23 @@ endif()
2323

2424
file(STRINGS "${source_path}" lines)
2525
foreach(line ${lines})
26-
if ("${line}" MATCHES "^[0-9a-fA-F].*$")
27-
set(GLFW_GAMEPAD_MAPPINGS "${GLFW_GAMEPAD_MAPPINGS}\"${line}\",\n")
26+
if (line MATCHES "^[0-9a-fA-F]")
27+
if (line MATCHES "platform:Windows")
28+
if (GLFW_WIN32_MAPPINGS)
29+
string(APPEND GLFW_WIN32_MAPPINGS "\n")
30+
endif()
31+
string(APPEND GLFW_WIN32_MAPPINGS "\"${line}\",")
32+
elseif (line MATCHES "platform:Mac OS X")
33+
if (GLFW_COCOA_MAPPINGS)
34+
string(APPEND GLFW_COCOA_MAPPINGS "\n")
35+
endif()
36+
string(APPEND GLFW_COCOA_MAPPINGS "\"${line}\",")
37+
elseif (line MATCHES "platform:Linux")
38+
if (GLFW_LINUX_MAPPINGS)
39+
string(APPEND GLFW_LINUX_MAPPINGS "\n")
40+
endif()
41+
string(APPEND GLFW_LINUX_MAPPINGS "\"${line}\",")
42+
endif()
2843
endif()
2944
endforeach()
3045

src/external/glfw/CMake/MacOSXBundleInfo.plist.in

-38
This file was deleted.

src/external/glfw/CMake/glfw3.pc.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Name: GLFW
77
Description: A multi-platform library for OpenGL, window and input
88
Version: @GLFW_VERSION@
99
URL: https://www.glfw.org/
10-
Requires.private: @GLFW_PKG_DEPS@
10+
Requires.private: @GLFW_PKG_CONFIG_REQUIRES_PRIVATE@
1111
Libs: -L${libdir} -l@GLFW_LIB_NAME@
12-
Libs.private: @GLFW_PKG_LIBS@
12+
Libs.private: @GLFW_PKG_CONFIG_LIBS_PRIVATE@
1313
Cflags: -I${includedir}

src/external/glfw/CMake/modules/FindEpollShim.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ if (EPOLLSHIM_INCLUDE_DIRS AND EPOLLSHIM_LIBRARIES)
1313
endif (EPOLLSHIM_INCLUDE_DIRS AND EPOLLSHIM_LIBRARIES)
1414

1515
include(FindPackageHandleStandardArgs)
16-
find_package_handle_standard_args(EPOLLSHIM DEFAULT_MSG EPOLLSHIM_LIBRARIES EPOLLSHIM_INCLUDE_DIRS)
16+
find_package_handle_standard_args(EpollShim DEFAULT_MSG EPOLLSHIM_LIBRARIES EPOLLSHIM_INCLUDE_DIRS)
1717
mark_as_advanced(EPOLLSHIM_INCLUDE_DIRS EPOLLSHIM_LIBRARIES)

src/external/glfw/CMake/modules/FindWaylandProtocols.cmake

-26
This file was deleted.

src/external/glfw/CMake/modules/FindXKBCommon.cmake

-34
This file was deleted.

0 commit comments

Comments
 (0)