Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-09 16:21:40 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-12-22 14:25:39 (GMT) |
| commit | d6bb5d79e3726d2aad82b52fe637030177b4950f (patch) | |
| tree | b2f4c74a1592825582f82d88d74ae3b85b42665b /Swiften/Examples/SendFile/SConscript | |
| parent | 2b7f55a30b07f08d32bccd3ea0a72ffd8c820c20 (diff) | |
| download | swift-d6bb5d79e3726d2aad82b52fe637030177b4950f.zip swift-d6bb5d79e3726d2aad82b52fe637030177b4950f.tar.bz2 | |
Replace MergeFlags calls by UseFlags calls.
Change-Id: If7193006987fd86d102e5e17aac426ef1a6ccd83
Diffstat (limited to 'Swiften/Examples/SendFile/SConscript')
| -rw-r--r-- | Swiften/Examples/SendFile/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Examples/SendFile/SConscript b/Swiften/Examples/SendFile/SConscript index d335513..e0f1256 100644 --- a/Swiften/Examples/SendFile/SConscript +++ b/Swiften/Examples/SendFile/SConscript @@ -1,8 +1,8 @@ Import("env") myenv = env.Clone() -myenv.MergeFlags(myenv["SWIFTEN_FLAGS"]) -myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"]) +myenv.UseFlags(myenv["SWIFTEN_FLAGS"]) +myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"]) myenv.Program("SendFile", ["SendFile.cpp"]) myenv.Program("ReceiveFile", ["ReceiveFile.cpp"]) |