summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-08-17 21:07:13 (GMT)
committerCătălin Badea <catalin.badea392@gmail.com>2012-08-19 20:17:52 (GMT)
commita216cabfbd9ee0244e70d1eb6093986e430c9ef1 (patch)
tree0786416c8c89cfbe898d6eb8b0e32fee7740923a /SwifTools/SConscript
parent456f6297ddb670115430aedccc5a49908f32b2ea (diff)
downloadswift-contrib-a216cabfbd9ee0244e70d1eb6093986e430c9ef1.zip
swift-contrib-a216cabfbd9ee0244e70d1eb6093986e430c9ef1.tar.bz2
Added Breakpad support for Windows.
Diffstat (limited to 'SwifTools/SConscript')
-rw-r--r--SwifTools/SConscript7
1 files changed, 5 insertions, 2 deletions
diff --git a/SwifTools/SConscript b/SwifTools/SConscript
index 5b97bed..3b25269 100644
--- a/SwifTools/SConscript
+++ b/SwifTools/SConscript
@@ -16,8 +16,8 @@ if env["SCONS_STAGE"] == "flags" :
if env["SCONS_STAGE"] == "build" :
swiftools_env = env.Clone()
- swiftools_env.MergeFlags(swiftools_env["SWIFTEN_FLAGS"])
- swiftools_env.MergeFlags(swiftools_env["BOOST_FLAGS"])
+ swiftools_env.UseFlags(swiftools_env["SWIFTEN_FLAGS"])
+ swiftools_env.UseFlags(swiftools_env["BOOST_FLAGS"])
sources = [
"Idle/IdleDetector.cpp",
@@ -44,6 +44,9 @@ if env["SCONS_STAGE"] == "build" :
elif swiftools_env["HAVE_XSS"] :
swiftools_env.Append(CPPDEFINES = ["HAVE_XSS"])
sources += ["Idle/XSSIdleQuerier.cpp"]
+
+ swiftools_env.UseFlags(swiftools_env["BREAKPAD_FLAGS"])
+ sources += ["CrashReporter.cpp"]
swiftools_env["SWIFTOOLS_OBJECTS"] = []
Export("swiftools_env")