From 57c0d20400e162b90050e72702f65cad37c12ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Fri, 13 May 2011 20:35:35 +0200
Subject: Always include -lX11 on Linux.


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"])
-- 
cgit v0.10.2-6-g49f6