Skip to content

Commit 5435f16

Browse files
committed
Update GLFW to 3.2.1.
1 parent 97d0ea6 commit 5435f16

File tree

325 files changed

+23944
-24064
lines changed

Some content is hidden

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

325 files changed

+23944
-24064
lines changed

lib/glfw/CMake/modules/FindEGL.cmake

Lines changed: 0 additions & 16 deletions
This file was deleted.

lib/glfw/CMake/modules/FindGLESv1.cmake

Lines changed: 0 additions & 16 deletions
This file was deleted.

lib/glfw/CMake/modules/FindGLESv2.cmake

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Find Vulkan
2+
#
3+
# VULKAN_INCLUDE_DIR
4+
# VULKAN_LIBRARY
5+
# VULKAN_FOUND
6+
7+
if (WIN32)
8+
find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS
9+
"$ENV{VULKAN_SDK}/Include"
10+
"$ENV{VK_SDK_PATH}/Include")
11+
if (CMAKE_CL_64)
12+
find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS
13+
"$ENV{VULKAN_SDK}/Bin"
14+
"$ENV{VK_SDK_PATH}/Bin")
15+
find_library(VULKAN_STATIC_LIBRARY NAMES vkstatic.1 HINTS
16+
"$ENV{VULKAN_SDK}/Bin"
17+
"$ENV{VK_SDK_PATH}/Bin")
18+
else()
19+
find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS
20+
"$ENV{VULKAN_SDK}/Bin32"
21+
"$ENV{VK_SDK_PATH}/Bin32")
22+
endif()
23+
else()
24+
find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS
25+
"$ENV{VULKAN_SDK}/include")
26+
find_library(VULKAN_LIBRARY NAMES vulkan HINTS
27+
"$ENV{VULKAN_SDK}/lib")
28+
endif()
29+
30+
include(FindPackageHandleStandardArgs)
31+
find_package_handle_standard_args(Vulkan DEFAULT_MSG VULKAN_LIBRARY VULKAN_INCLUDE_DIR)
32+
33+
mark_as_advanced(VULKAN_INCLUDE_DIR VULKAN_LIBRARY VULKAN_STATIC_LIBRARY)
34+

lib/glfw/CMake/modules/FindWayland.cmake

Lines changed: 0 additions & 66 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
find_package(PkgConfig)
2+
3+
pkg_check_modules(WaylandProtocols QUIET wayland-protocols>=${WaylandProtocols_FIND_VERSION})
4+
5+
execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-protocols
6+
OUTPUT_VARIABLE WaylandProtocols_PKGDATADIR
7+
RESULT_VARIABLE _pkgconfig_failed)
8+
if (_pkgconfig_failed)
9+
message(FATAL_ERROR "Missing wayland-protocols pkgdatadir")
10+
endif()
11+
12+
string(REGEX REPLACE "[\r\n]" "" WaylandProtocols_PKGDATADIR "${WaylandProtocols_PKGDATADIR}")
13+
14+
find_package_handle_standard_args(WaylandProtocols
15+
FOUND_VAR
16+
WaylandProtocols_FOUND
17+
REQUIRED_VARS
18+
WaylandProtocols_PKGDATADIR
19+
VERSION_VAR
20+
WaylandProtocols_VERSION
21+
HANDLE_COMPONENTS
22+
)
23+
24+
set(WAYLAND_PROTOCOLS_FOUND ${WaylandProtocols_FOUND})
25+
set(WAYLAND_PROTOCOLS_PKGDATADIR ${WaylandProtocols_PKGDATADIR})
26+
set(WAYLAND_PROTOCOLS_VERSION ${WaylandProtocols_VERSION})

0 commit comments

Comments
 (0)