summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-08-20 17:14:02 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-08-20 18:25:17 (GMT)
commitb3dc968b7c424351bac87bfed42681bd0500d86c (patch)
tree1f3ec7ee8f8b3e9d3e274ba77684b8606dc96377 /Swift/QtUI/SConscript
parent5fa4903a7c1c7a7733afdd1d6c4c5dcccec97b19 (diff)
downloadswift-b3dc968b7c424351bac87bfed42681bd0500d86c.zip
swift-b3dc968b7c424351bac87bfed42681bd0500d86c.tar.bz2
Don't bundle sounds.
Diffstat (limited to 'Swift/QtUI/SConscript')
-rw-r--r--Swift/QtUI/SConscript12
1 files changed, 8 insertions, 4 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 6c30f42..0d043fb 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -127,11 +127,13 @@ myenv.Uic4("QtBookmarkDetailWindow.ui")
myenv.Qrc("DefaultTheme.qrc")
myenv.Qrc("Swift.qrc")
+commonResources = ["../resources/sounds"]
+
if env["PLATFORM"] == "darwin" :
frameworks = []
if env["HAVE_SPARKLE"] :
frameworks.append(env["SPARKLE_FRAMEWORK"])
- app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"], frameworks = frameworks)
+ app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"] + commonResources, frameworks = frameworks)
if env["DIST"] :
myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], [
"$QTDIR/bin/macdeployqt $SOURCE -dmg",
@@ -142,13 +144,15 @@ if env.get("SWIFT_INSTALLDIR", "") :
env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram)
env.InstallAs(os.path.join(env["SWIFT_INSTALLDIR"], "share", "pixmaps", "swift.xpm"), "../resources/logo/logo-icon-32.xpm")
env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "applications"), "../resources/swift.desktop")
-
+ for resource in commonResources :
+ env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "swift"), resource)
+
if env["PLATFORM"] == "win32" :
if env["DIST"] :
myenv.WindowsBundle("Swift", resources = [
os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),
- os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
- ],
+ os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
+ ] + commonResources,
qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"],
qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "QtXMLPatterns4", "phonon4"])