summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2014-02-22 12:33:59 (GMT)
committerKevin Smith <git@kismith.co.uk>2014-02-22 16:25:27 (GMT)
commit989b3711186d7fe9766dffa9334d70de78666db3 (patch)
treeca282e67d6da17430f0119362fa907357c32e0bb /Swift/QtUI
parentbe45135a1b1051eab02003fe54ee7e87f5f1558e (diff)
downloadswift-989b3711186d7fe9766dffa9334d70de78666db3.zip
swift-989b3711186d7fe9766dffa9334d70de78666db3.tar.bz2
Make git and wix wrappers in build system more convenient for use by other projects
Change-Id: I173f42bfe2dde7d18be3d54976649aa1bac13dbf
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 24fb371..56d2d1b 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -429,6 +429,7 @@ if env["PLATFORM"] == "win32" :
wixincludecontent += "<?define %s = \"%s\" ?>" % (key, wixvariables[key])
wixincludecontent += "</Include>"
myenv.WriteVal("..\\Packaging\\Wix\\variables.wxs", env.Value(wixincludecontent))
+ myenv["WIX_SOURCE_OBJECT_DIR"] = "Swift\\QtUI\\Swift"
myenv.WiX_Heat('..\\Packaging\\WiX\\gen_files.wxs', windowsBundleFiles + copying)
myenv.WiX_Candle('..\\Packaging\\WiX\\Swift.wixobj', '..\\Packaging\\WiX\\Swift.wxs')
myenv.WiX_Candle('..\\Packaging\\WiX\\gen_files.wixobj', '..\\Packaging\\WiX\\gen_files.wxs')