Merge branch 'linux' of git://github.com/dougvj/xenia into linux

# Conflicts: # .travis.yml
2017-12-14 19:20:02 -06:00
parent d896c1f3f0 0406f19f4d
commit 02e37be4e5
45 changed files with 2214 additions and 369 deletions
--- a/third_party/vulkan/loader/premake5.lua
+++ b/third_party/vulkan/loader/premake5.lua
@@ -30,6 +30,9 @@ project("vulkan-loader")
    removefiles("dirent_on_windows.c")
  filter("platforms:Linux")
    defines({
+      "VK_USE_PLATFORM_XCB_KHR",
      [[SYSCONFDIR="\"/etc\""]],
+      [[FALLBACK_CONFIG_DIRS="\"/etc/xdg\""]],
      [[DATADIR="\"/usr/share\""]],
+      [[FALLBACK_DATA_DIRS="\"/usr/share:/usr/local/share\""]],
    })