Merge branch 'master' into vulkan

Former-commit-id: 97496794d69ba8f173760f4dd52e909f5aa0b471 [formerly 00be642ad6482e973584725573d65f48a0ce2218]
Former-commit-id: d82c78167600e694b3b7f43d3565f41c706adc00
This commit is contained in:
Lynix 2016-06-01 09:36:49 +02:00
commit 633e7b9f4e
1 changed files with 4 additions and 4 deletions

View File

@ -10,10 +10,10 @@ MODULE.Libraries = {
}
MODULE.OsDefines.Linux = {
"VK_USE_PLATFORM_MIR_KHR",
"VK_USE_PLATFORM_XCB_KHR",
"VK_USE_PLATFORM_XLIB_KHR",
"VK_USE_PLATFORM_WAYLAND_KHR"
-- "VK_USE_PLATFORM_MIR_KHR",
"VK_USE_PLATFORM_XCB_KHR"
-- "VK_USE_PLATFORM_XLIB_KHR",
-- "VK_USE_PLATFORM_WAYLAND_KHR"
}
MODULE.OsDefines.BSD = MODULE.OsDefines.Linux