summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-08-17 21:07:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-08-17 21:07:13 (GMT)
commit4397df6b409ca84f63838fa635fc2abe8af80b71 (patch)
tree0806d51a1aaa6a1f9ac00df318be72fbee19ec1d /SwifTools/SConscript
parentead6c91f24d77de3319e77ae1354387407065ef1 (diff)
downloadswift-contrib-4397df6b409ca84f63838fa635fc2abe8af80b71.zip
swift-contrib-4397df6b409ca84f63838fa635fc2abe8af80b71.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")