encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Roll GLFW to pick up macOS Mojave fixes 

BUG=dawn:35

Change-Id: Id9f71ab3a6023b21883d1b3d2f8afcebcf5b2f71
Reviewed-on: https://dawn-review.googlesource.com/c/2480
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Corentin Wallez 2018-11-19 10:21:23 +00:00
parent 15d8cb765f
commit 391c8a9224
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -74,7 +74,7 @@ deps = {
# GLFW for tests and samples # GLFW for tests and samples
'third_party/glfw': { 'third_party/glfw': {
'url': '{chromium_git}/external/github.com/glfw/glfw@096efdf798896cff80a0b2db08d7398b703406fe', 'url': '{chromium_git}/external/github.com/glfw/glfw@2de2589f910b1a85905f425be4d32f33cec092df',
'condition': 'dawn_standalone', 'condition': 'dawn_standalone',
}, },

14
third_party/BUILD.gn vendored
View File

@ -218,10 +218,14 @@ static_library("glfw") {
"${glfw_dir}/include/GLFW/glfw3.h", "${glfw_dir}/include/GLFW/glfw3.h",
"${glfw_dir}/include/GLFW/glfw3native.h", "${glfw_dir}/include/GLFW/glfw3native.h",
"${glfw_dir}/src/context.c", "${glfw_dir}/src/context.c",
"${glfw_dir}/src/egl_context.c",
"${glfw_dir}/src/egl_context.h",
"${glfw_dir}/src/init.c", "${glfw_dir}/src/init.c",
"${glfw_dir}/src/input.c", "${glfw_dir}/src/input.c",
"${glfw_dir}/src/internal.h", "${glfw_dir}/src/internal.h",
"${glfw_dir}/src/monitor.c", "${glfw_dir}/src/monitor.c",
"${glfw_dir}/src/osmesa_context.c",
"${glfw_dir}/src/osmesa_context.h",
"${glfw_dir}/src/vulkan.c", "${glfw_dir}/src/vulkan.c",
"${glfw_dir}/src/window.c", "${glfw_dir}/src/window.c",
] ]
@ -229,8 +233,6 @@ static_library("glfw") {
if (is_win) { if (is_win) {
sources += [ sources += [
"${glfw_dir}/src/egl_context.c",
"${glfw_dir}/src/egl_context.h",
"${glfw_dir}/src/wgl_context.c", "${glfw_dir}/src/wgl_context.c",
"${glfw_dir}/src/wgl_context.h", "${glfw_dir}/src/wgl_context.h",
"${glfw_dir}/src/win32_init.c", "${glfw_dir}/src/win32_init.c",
@ -239,22 +241,20 @@ static_library("glfw") {
"${glfw_dir}/src/win32_monitor.c", "${glfw_dir}/src/win32_monitor.c",
"${glfw_dir}/src/win32_platform.h", "${glfw_dir}/src/win32_platform.h",
"${glfw_dir}/src/win32_time.c", "${glfw_dir}/src/win32_time.c",
"${glfw_dir}/src/win32_tls.c", "${glfw_dir}/src/win32_thread.c",
"${glfw_dir}/src/win32_window.c", "${glfw_dir}/src/win32_window.c",
] ]
} }
if (is_linux || is_mac) { if (is_linux || is_mac) {
sources += [ sources += [
"${glfw_dir}/src/posix_tls.c", "${glfw_dir}/src/posix_thread.c",
"${glfw_dir}/src/posix_tls.h", "${glfw_dir}/src/posix_thread.h",
] ]
} }
if (is_linux) { if (is_linux) {
sources += [ sources += [
"${glfw_dir}/src/egl_context.c",
"${glfw_dir}/src/egl_context.h",
"${glfw_dir}/src/glx_context.c", "${glfw_dir}/src/glx_context.c",
"${glfw_dir}/src/glx_context.h", "${glfw_dir}/src/glx_context.h",
"${glfw_dir}/src/linux_joystick.c", "${glfw_dir}/src/linux_joystick.c",