phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes unnecessary linking of X11 on OS X.

Browse Source 
This was SVN commit r12219.
This commit is contained in:
historic_bruno 2012-07-28 23:48:57 +00:00
parent 7eb751fa83
commit d1b2922f02
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/premake/premake4.lua
View File

@ -724,6 +724,7 @@ used_extern_libs = {
}
if not os.is("windows") and not _OPTIONS["android"] and not os.is("macosx") then
-- X11 should only be linked on *nix
table.insert(used_extern_libs, "x11")
table.insert(used_extern_libs, "xcursor")
end
@ -936,9 +937,12 @@ function setup_atlas_projects()
"sdl", -- key definitions
"spidermonkey",
"wxwidgets",
"x11",
"zlib",
}
if not os.is("windows") and not os.is("macosx") then
-- X11 should only be linked on *nix
table.insert(atlas_extern_libs, "x11")
end
setup_atlas_project("AtlasUI", "SharedLib", atlas_src,
{ -- include