--- C:/Projects/U++Apps/uppsrc/ide/Builders/MscBuilder.cpp Tue May 22 17:33:37 2007 +++ C:/Projects/U++/uppsrc/ide/Builders/MscBuilder.cpp Tue May 29 16:20:12 2007 @@ -71,14 +71,11 @@ if(HasFlag("SH4")) cc = "shcl /Qsh4"; else - if(HasFlag("MSC8_64")) - cc = "cl /Wp64 "; - else if(HasFlag("MSC8ARM")) - cc = "cl -GS- "; + cc = "cl -GS-"; else cc = HasFlag("INTEL") ? "icl" : "cl"; - cc << " -c -nologo -W3 -GR"; + cc << (HasFlag("MSC8X64") ? " -nologo -Wp64 -W3 -GR -c" : " -nologo -W3 -GR -c"); cc << IncludesDefinesTargetTime(); return cc; } @@ -90,7 +87,7 @@ if(HasFlag("SH3")) return "SH3"; if(HasFlag("SH4")) return "SH4"; if(HasFlag("MSC8ARM")) return "ARM"; - if(HasFlag("MSC8_64")) return "x64"; + if(HasFlag("MSC8X64")) return "X64"; if(HasFlag("WIN32")) return "I386"; return "IX86"; } @@ -122,7 +119,7 @@ String pdb = GetHostPathQ(CatAnyPath(outdir, pkg_slot + ".pdb")); String cc; cc << " -Gy -Fd" << pdb; - if(do_pch && !HasFlag("MSC8") && !HasFlag("MSC8_64")&& !HasFlag("MSC8ARM")) // MSC8 does not support automatic precompiled headers... + if(do_pch && !HasFlag("MSC8") && !HasFlag("MSC8X64") && !HasFlag("MSC8ARM")) // MSC8 does not support automatic precompiled headers... cc << " -YX -Fp" << GetHostPathQ(CatAnyPath(outdir, pkg_slot + ".pch")) << ' '; return cc; } @@ -150,7 +147,7 @@ " -GX-"; // turn off exception handling } else - if(HasFlag("MSC8") || HasFlag("MSC8_64") || HasFlag("MSC8ARM")) + if(HasFlag("MSC8") || HasFlag("MSC8X64") || HasFlag("MSC8ARM")) cc << " -EHsc"; else cc << " -GX"; @@ -165,7 +162,7 @@ cc << " -Zi"; cc << ' ' << Gather(pkg.option, config.GetKeys()); cc << (HasFlag("SHARED") || is_shared ? " -MD" - : (HasFlag("MT") || HasFlag("MSC8") || HasFlag("MSC8_64") || HasFlag("MSC8ARM")) ? " -MT" : " -ML"); + : (HasFlag("MT") || HasFlag("MSC8") || HasFlag("MSC8X64") || HasFlag("MSC8ARM")) ? " -MT" : " -ML"); String cc_size = cc; String cc_speed = cc; @@ -424,7 +421,7 @@ return false; } else - if(HasFlag("MSC8") && is_shared) { + if((HasFlag("MSC8") || HasFlag("MSC8X64")) && is_shared) { String mt("mt -nologo -manifest "); mt << GetHostPathQ(product) << ".manifest -outputresource:" << GetHostPathQ(product) << ";2"; Execute(mt); @@ -485,7 +482,7 @@ CustomStep(".pre-link"); if(Execute(link) == 0) { CustomStep(".post-link"); - if((HasFlag("MSC8") || HasFlag("MSC8_64")) && HasFlag("SHARED")) { + if((HasFlag("MSC8") || HasFlag("MSC8X64")) && HasFlag("SHARED")) { String mt("mt -nologo -manifest "); mt << GetHostPathQ(target) << ".manifest -outputresource:" << GetHostPathQ(target) << (HasFlag("DLL") ? ";2" : ";1"); @@ -520,7 +517,7 @@ { RegisterBuilder("MSC71", CreateMscBuilder); RegisterBuilder("MSC8", CreateMscBuilder); - RegisterBuilder("MSC8_64", CreateMscBuilder); + RegisterBuilder("MSC8X64", CreateMscBuilder); RegisterBuilder("MSC8ARM", CreateMscBuilder); RegisterBuilder("EVC_ARM", CreateMscBuilder); RegisterBuilder("EVC_MIPS", CreateMscBuilder);