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
commit 02e37be4e5
45 changed files with 2214 additions and 369 deletions

View file

@ -87,10 +87,27 @@ filter("platforms:Linux")
toolset("clang")
buildoptions({
-- "-mlzcnt", -- (don't) Assume lzcnt is supported.
"`pkg-config --cflags gtk+-x11-3.0`"
})
links({
"pthread",
"dl",
"lz4",
"X11",
"xcb",
"X11-xcb",
"GL",
"GLEW",
"vulkan",
"c++",
"c++abi"
})
linkoptions({
"`pkg-config --libs gtk+-3.0`",
})
filter({"platforms:Linux", "kind:*App"})
linkgroups("On")
filter({"platforms:Linux", "language:C++", "toolset:gcc"})
buildoptions({
@ -105,7 +122,6 @@ filter({"platforms:Linux", "language:C++", "toolset:clang"})
"-stdlib=libc++",
})
links({
"c++",
})
filter("platforms:Windows")