Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-09-12 16:10:50 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-09-12 16:10:50 (GMT) |
| commit | 41e89bb5ed1a9d38d1ece1310ef708daad54a9a9 (patch) | |
| tree | 729117779ef76f28bff02413ce74daac46ccc565 /SwifTools/SConscript | |
| parent | de0cdc61015f86a334bc4c0589bafe0bfdf89786 (diff) | |
| download | swift-contrib-41e89bb5ed1a9d38d1ece1310ef708daad54a9a9.zip swift-contrib-41e89bb5ed1a9d38d1ece1310ef708daad54a9a9.tar.bz2 | |
Moved application message display around.
Diffstat (limited to 'SwifTools/SConscript')
| -rw-r--r-- | SwifTools/SConscript | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/SwifTools/SConscript b/SwifTools/SConscript index 7620879..2675b9f 100644 --- a/SwifTools/SConscript +++ b/SwifTools/SConscript @@ -15,8 +15,8 @@ if env["SCONS_STAGE"] == "flags" : ################################################################################ if env["SCONS_STAGE"] == "build" : - myenv = env.Clone() - myenv.MergeFlags(myenv["BOOST_FLAGS"]) + swiftools_env = env.Clone() + swiftools_env.MergeFlags(swiftools_env["BOOST_FLAGS"]) sources = [ "Idle/IdleDetector.cpp", @@ -29,24 +29,29 @@ if env["SCONS_STAGE"] == "build" : "TabComplete.cpp", ] - if myenv.get("HAVE_SPARKLE", 0) : - myenv.MergeFlags(myenv["SPARKLE_FLAGS"]) - myenv.Append(CPPDEFINES = ["HAVE_SPARKLE"]) + if swiftools_env.get("HAVE_SPARKLE", 0) : + swiftools_env.MergeFlags(swiftools_env["SPARKLE_FLAGS"]) + swiftools_env.Append(CPPDEFINES = ["HAVE_SPARKLE"]) sources += ["AutoUpdater/SparkleAutoUpdater.mm"] - if myenv["PLATFORM"] == "win32" : + if swiftools_env["PLATFORM"] == "win32" : sources += ["Idle/WindowsIdleQuerier.cpp"] - elif myenv["PLATFORM"] == "darwin" and myenv.get("HAVE_IOKIT", False) : - myenv.Append(CPPDEFINES = ["HAVE_IOKIT"]) + elif swiftools_env["PLATFORM"] == "darwin" and swiftools_env.get("HAVE_IOKIT", False) : + swiftools_env.Append(CPPDEFINES = ["HAVE_IOKIT"]) sources += ["Idle/MacOSXIdleQuerier.cpp"] - elif myenv["HAVE_XSS"] : - myenv.Append(CPPDEFINES = ["HAVE_XSS"]) + elif swiftools_env["HAVE_XSS"] : + swiftools_env.Append(CPPDEFINES = ["HAVE_XSS"]) sources += ["Idle/XSSIdleQuerier.cpp"] - - myenv.StaticLibrary("SwifTools", sources) - + + swiftools_env["SWIFTOOLS_OBJECTS"] = [] + Export("swiftools_env") + SConscript(dirs = [ + "Dock", "Idle/IdleQuerierTest", "Idle/UnitTest", "UnitTest" ]) + + swiftools_env.StaticLibrary("SwifTools", sources + swiftools_env["SWIFTOOLS_OBJECTS"]) +
\ No newline at end of file |