diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h index 8e3356d13..2c1492775 100644 --- a/uppsrc/Core/Core.h +++ b/uppsrc/Core/Core.h @@ -3,6 +3,10 @@ #define QLIB3 +#ifndef flagMT +#define flagMT // MT is now always on +#endif + #if defined(flagMT) #define _MULTITHREADED #define MULTITHREADED diff --git a/uppsrc/ide/Builders/GccBuilder.cpp b/uppsrc/ide/Builders/GccBuilder.cpp index 8ade1d301..b04f1b8c1 100644 --- a/uppsrc/ide/Builders/GccBuilder.cpp +++ b/uppsrc/ide/Builders/GccBuilder.cpp @@ -110,7 +110,7 @@ bool GccBuilder::BuildPackage(const String& package, Vector& linkfile, V } String cc = CmdLine(package, pkg); - if(HasFlag("WIN32") && HasFlag("MT")) + if(HasFlag("WIN32")/* && HasFlag("MT")*/) cc << " -mthreads"; if(HasFlag("DEBUG_MINIMAL")) cc << (HasFlag("WIN32") ? " -g1" : " -ggdb -g1"); @@ -455,7 +455,7 @@ bool GccBuilder::Link(const Vector& linkfile, const String& linkoptions, lnk << " -mwindowsce"; else if(HasFlag("WIN32") && !HasFlag("CLANG")) { lnk << " -mwindows"; - if(HasFlag("MT")) + // if(HasFlag("MT")) lnk << " -mthreads"; if(!HasFlag("GUI")) lnk << " -mconsole"; diff --git a/uppsrc/ide/Builders/MscBuilder.cpp b/uppsrc/ide/Builders/MscBuilder.cpp index b96fc454b..ac3b112cb 100644 --- a/uppsrc/ide/Builders/MscBuilder.cpp +++ b/uppsrc/ide/Builders/MscBuilder.cpp @@ -272,8 +272,7 @@ bool MscBuilder::BuildPackage(const String& package, Vector& linkfile, V if(HasFlag("DEBUG_FULL")) cc << " -Zi"; cc << ' ' << Gather(pkg.option, config.GetKeys()); - cc << (HasFlag("SHARED") || is_shared || is_clr ? " -MD" - : (HasFlag("MT") || IsMsc89()) ? " -MT" : " -ML"); + cc << (HasFlag("SHARED") || is_shared || is_clr ? " -MD" : " -MT"); String cc_size = cc; String cc_speed = cc;