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

# Conflicts:
#	.travis.yml
This commit is contained in:
DrChat
2017-12-14 19:20:02 -06:00
45 changed files with 2214 additions and 369 deletions

View File

@@ -8,8 +8,15 @@ project("xenia-app")
targetname("xenia")
language("C++")
links({
"capstone",
"gflags",
"glslang-spirv",
"imgui",
"libavcodec",
"libavutil",
"snappy",
"spirv-tools",
"vulkan-loader",
"xenia-apu",
"xenia-apu-nop",
"xenia-base",
@@ -21,11 +28,15 @@ project("xenia-app")
"xenia-gpu-gl4",
"xenia-gpu-null",
"xenia-gpu-vulkan",
"xenia-hid",
"xenia-hid-nop",
"xenia-kernel",
"xenia-ui",
"xenia-ui-gl",
"xenia-ui-spirv",
"xenia-ui-vulkan",
"xenia-vfs",
"xxhash",
})
flags({
"WinMain", -- Use WinMain instead of main.
@@ -40,9 +51,10 @@ project("xenia-app")
"xenia_main.cc",
"../base/main_"..platform_suffix..".cc",
})
files({
"main_resources.rc",
})
filter("platforms:Windows")
files({
"main_resources.rc",
})
resincludedirs({
project_root,
})