diff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-03-28 15:52:01 (GMT) | 
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-03-28 15:52:01 (GMT) | 
| commit | 1b7ef5be1db7b751c0ee383a34b1f5d0006a2e5d (patch) | |
| tree | 57a38b46858734e70f1b6176ebe3e4ce057ce4f6 /Swift/Controllers/SConscript | |
| parent | f53a1ef582494458301b97bf6e546be52d7ff7e8 (diff) | |
| download | swift-1b7ef5be1db7b751c0ee383a34b1f5d0006a2e5d.zip swift-1b7ef5be1db7b751c0ee383a34b1f5d0006a2e5d.tar.bz2 | |
Fixed build.
Diffstat (limited to 'Swift/Controllers/SConscript')
| -rw-r--r-- | Swift/Controllers/SConscript | 74 | 
1 files changed, 42 insertions, 32 deletions
| diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript index bd2c16e..8c12c50 100644 --- a/Swift/Controllers/SConscript +++ b/Swift/Controllers/SConscript @@ -1,36 +1,46 @@  Import("env") -env["SWIFT_CONTROLLERS_FLAGS"] = { -		"LIBPATH": [Dir(".")], -		"LIBS": ["SwiftControllers"] -	} +################################################################################ +# Flags +################################################################################ -myenv = env.Clone() -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.StaticLibrary("SwiftControllers", [ -		"Chat/ChatController.cpp", -		"Chat/ChatControllerBase.cpp", -		"Chat/ChatsManager.cpp", -		"MainController.cpp", -		"NickResolver.cpp", -		"RosterController.cpp", -		"XMPPRosterController.cpp", -		"Chat/MUCController.cpp", -		"EventController.cpp", -		"EventWindowController.cpp", -		"SoundEventController.cpp", -		"SystemTrayController.cpp", -		"XMLConsoleController.cpp", -		"UIEvents/UIEvent.cpp", -		"UIInterfaces/XMLConsoleWidget.cpp", -		"PreviousStatusStore.cpp", -	]) +if env["SCONS_STAGE"] == "flags" : +	env["SWIFT_CONTROLLERS_FLAGS"] = { +			"LIBPATH": [Dir(".")], +			"LIBS": ["SwiftControllers"] +		} -env.Append(UNITTEST_SOURCES = [ -		File("UnitTest/NickResolverTest.cpp"), -		File("UnitTest/RosterControllerTest.cpp"), -		File("UnitTest/XMPPRosterControllerTest.cpp"), -		File("UnitTest/PreviousStatusStoreTest.cpp"), -		File("Chat/UnitTest/ChatsManagerTest.cpp"), -		File("UnitTest/MockChatWindow.cpp"), -	]) +################################################################################ +# Build +################################################################################ + +if env["SCONS_STAGE"] == "build" : +	myenv = env.Clone() +	myenv.MergeFlags(env["BOOST_FLAGS"]) +	myenv.StaticLibrary("SwiftControllers", [ +			"Chat/ChatController.cpp", +			"Chat/ChatControllerBase.cpp", +			"Chat/ChatsManager.cpp", +			"MainController.cpp", +			"NickResolver.cpp", +			"RosterController.cpp", +			"XMPPRosterController.cpp", +			"Chat/MUCController.cpp", +			"EventController.cpp", +			"EventWindowController.cpp", +			"SoundEventController.cpp", +			"SystemTrayController.cpp", +			"XMLConsoleController.cpp", +			"UIEvents/UIEvent.cpp", +			"UIInterfaces/XMLConsoleWidget.cpp", +			"PreviousStatusStore.cpp", +		]) + +	env.Append(UNITTEST_SOURCES = [ +			File("UnitTest/NickResolverTest.cpp"), +			File("UnitTest/RosterControllerTest.cpp"), +			File("UnitTest/XMPPRosterControllerTest.cpp"), +			File("UnitTest/PreviousStatusStoreTest.cpp"), +			File("Chat/UnitTest/ChatsManagerTest.cpp"), +			File("UnitTest/MockChatWindow.cpp"), +		]) | 
 Swift
 Swift