summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgibbed <rick@gibbed.us>2018-06-08 09:52:35 -0500
committergibbed <rick@gibbed.us>2018-06-08 09:52:35 -0500
commitfb9eb8489381af1340385be3dfd1eee9d0a0a58d (patch)
treeee4bd8c23d1287629d41b652780480d930d0c256
parent40e8d78d168320a51f8ecb587afe3191e108105c (diff)
Fix premake for xenia-hid-demo and xenia-ui-window-vulkan-demo.
-rw-r--r--src/xenia/hid/premake5.lua23
-rw-r--r--src/xenia/ui/vulkan/premake5.lua10
2 files changed, 10 insertions, 23 deletions
diff --git a/src/xenia/hid/premake5.lua b/src/xenia/hid/premake5.lua
index a348160f6..1b374a4fb 100644
--- a/src/xenia/hid/premake5.lua
+++ b/src/xenia/hid/premake5.lua
@@ -33,16 +33,6 @@ project("xenia-hid-demo")
"xenia-ui",
"xenia-ui-vulkan",
})
- filter("platforms:Linux")
- links({
- "X11",
- "xcb",
- "X11-xcb",
- "GL",
- "vulkan",
- })
- filter()
-
flags({
"WinMain", -- Use WinMain instead of main.
})
@@ -55,14 +45,21 @@ project("xenia-hid-demo")
})
files({
"hid_demo.cc",
- project_root.."/src/xenia/base/main_"..platform_suffix..".cc",
- })
- files({
+ "../base/main_"..platform_suffix..".cc",
})
resincludedirs({
project_root,
})
+ filter("platforms:Linux")
+ links({
+ "X11",
+ "xcb",
+ "X11-xcb",
+ "GL",
+ "vulkan",
+ })
+
filter("platforms:Windows")
links({
"xenia-hid-winkey",
diff --git a/src/xenia/ui/vulkan/premake5.lua b/src/xenia/ui/vulkan/premake5.lua
index 51fd69aa5..1624d3d4e 100644
--- a/src/xenia/ui/vulkan/premake5.lua
+++ b/src/xenia/ui/vulkan/premake5.lua
@@ -37,16 +37,6 @@ project("xenia-ui-window-vulkan-demo")
"xenia-ui-spirv",
"xenia-ui-vulkan",
})
- filter("platforms:Linux")
- links({
- "X11",
- "xcb",
- "X11-xcb",
- "GL",
- "vulkan",
- })
- filter()
-
flags({
"WinMain", -- Use WinMain instead of main.
})