Merge branch 'master' into d3d12

2019-04-18 17:54:57 +03:00
parent 35061880d9 593a871c84
commit ec92d46480
16 changed files with 81 additions and 66 deletions
--- a/src/xenia/ui/vulkan/premake5.lua
+++ b/src/xenia/ui/vulkan/premake5.lua
@@ -37,9 +37,6 @@ project("xenia-ui-window-vulkan-demo")
    "xenia-ui-spirv",
    "xenia-ui-vulkan",
  })
-  flags({
-    "WinMain",  -- Use WinMain instead of main.
-  })
  defines({
  })
  includedirs({