Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-08-13 09:45:49 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-08-13 09:45:49 (GMT) |
| commit | ba1aa621f0441f20b1ed2885832fce9cb15e4e15 (patch) | |
| tree | 7b66e2f631dde63a2139321406eab809ded1c79e | |
| parent | 520833ec16ffd5c5448983e21dd5d96e8b8168f5 (diff) | |
| download | swift-contrib-ba1aa621f0441f20b1ed2885832fce9cb15e4e15.zip swift-contrib-ba1aa621f0441f20b1ed2885832fce9cb15e4e15.tar.bz2 | |
More SCons windows tweaks.
| -rw-r--r-- | SConstruct | 13 | ||||
| -rw-r--r-- | Slimber/CLI/SConscript | 2 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 5 |
3 files changed, 14 insertions, 6 deletions
@@ -31,12 +31,18 @@ env.Alias("dist", ["."]) # Default compiler flags if env["optimize"] : env.Append(CCFLAGS = "-O2") + if env["PLATFORM"] == "win32" : + env.Append(CCFLAGS = ["GL"]) + env.Append(LINKFLAGS = ["/INCREMENTAL:NO", "/LTCG"]) if env["debug"] : if env["PLATFORM"] == "win32" : env.Append(CCFLAGS = ["/Zi", "/MDd"]) + env.Append(LINKFLAGS = ["/DEBUG"]) else : env.Append(CCFLAGS = "-g") +elif env["PLATFORM"] == "win32" : + env.Append(CCFLAGS = ["/MD"]) if env.get("universal", 0) : assert(env["PLATFORM"] == "darwin") @@ -68,6 +74,8 @@ if env.get("valgrind", 0) : if env["PLATFORM"] == "win32" : env.Append(LIBS = ["dnsapi", "ws2_32", "wsock32"]) env.Append(CCFLAGS = "/EHsc") + env["LINKCOM"] = [env["LINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1'] + env["SHLINKCOM"] = [env["SHLINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2'] if env["PLATFORM"] == "darwin" : env.Append(FRAMEWORKS = "AppKit") @@ -119,11 +127,6 @@ if int(ARGUMENTS.get("V", 0)) == 0: if env["PLATFORM"] == "win32" : env["MSVC_BATCH"] = 1 - env["LINKCOM"] = [env["LINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1'] - env["SHLINKCOM"] = [env["SHLINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2'] - #env["LINKFLAGS"] = ["/SUBSYSTEM:WINDOWS", "/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'"] - env["LINKFLAGS"] = ["/SUBSYSTEM:CONSOLE"] - ################################################################################ # Platform configuration diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript index 56c98fd..b65843d 100644 --- a/Slimber/CLI/SConscript +++ b/Slimber/CLI/SConscript @@ -5,4 +5,4 @@ myenv.MergeFlags(env["SLIMBER_FLAGS"]) myenv.MergeFlags(env["SWIFTEN_FLAGS"]) myenv.MergeFlags(env["BOOST_FLAGS"]) -#myenv.Program("slimber", ["main.cpp"]) +myenv.Program("slimber", ["main.cpp"]) diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 4b6bcba..5615819 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -53,6 +53,11 @@ myenv.Append(CPPPATH = ["/usr/include/phonon"]) myenv.Append(CPPPATH = ["."]) +if env["PLATFORM"] == "win32" : + #env["LINKFLAGS"] = ["/SUBSYSTEM:WINDOWS", "/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'"] + myenv["LINKFLAGS"] = ["/SUBSYSTEM:CONSOLE"] + + myenv.Command("DefaultTheme.qrc", "../resources/themes/Default", Action(generateDefaultTheme, cmdstr = "$GENCOMSTR")) sources = [ |