summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-05-13 18:35:35 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-05-13 18:41:19 (GMT)
commit57c0d20400e162b90050e72702f65cad37c12ead (patch)
treef81f17467abb719797f0236b70b2ad02e140b273
parentbb06d0017fdf338da362bf48cc820b78cfcf9eff (diff)
downloadswift-contrib-57c0d20400e162b90050e72702f65cad37c12ead.zip
swift-contrib-57c0d20400e162b90050e72702f65cad37c12ead.tar.bz2
Always include -lX11 on Linux.
-rw-r--r--BuildTools/SCons/SConstruct2
-rw-r--r--Swift/QtUI/SConscript2
2 files changed, 3 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index c8459e1..284c032 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -423,7 +423,7 @@ env["HAVE_XSS"] = 0
if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
xss_flags = {
"LIBPATH": ["/usr/X11R6/lib"],
- "LIBS": ["X11", "Xss"]
+ "LIBS": ["Xss"]
}
xss_env = conf_env.Clone()
xss_env.MergeFlags(xss_flags)
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 90d528a..6157cab 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -25,6 +25,8 @@ myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"])
myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
if myenv["HAVE_XSS"] :
myenv.MergeFlags(env["XSS_FLAGS"])
+if env["PLATFORM"] == "posix" :
+ myenv.Append(LIBS = ["X11"])
if myenv["HAVE_SPARKLE"] :
myenv.MergeFlags(env["SPARKLE_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])