From 5c45ec1dbcc1e3852543060dd5fc4d2f2ef9088a Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 20 Jan 2015 14:14:05 +0000
Subject: [PATCH] U++: SSE2 flag removed (delegated to build method definition)

git-svn-id: svn://ultimatepp.org/upp/trunk@8072 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/AutoSetup.cpp            |  5 +++++
 uppsrc/ide/Builders/GccBuilder.icpp | 10 +++++-----
 uppsrc/ide/Builders/MscBuilder.icpp |  4 ++--
 uppsrc/ide/Builders/init            | 10 +++++-----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/uppsrc/ide/AutoSetup.cpp b/uppsrc/ide/AutoSetup.cpp
index 11c27e372..8382b0e4f 100644
--- a/uppsrc/ide/AutoSetup.cpp
+++ b/uppsrc/ide/AutoSetup.cpp
@@ -445,6 +445,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -539,6 +540,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -629,6 +631,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -719,6 +722,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -804,6 +808,7 @@ void AutoSetup()
 							AppendFileName(sdk, "Lib") +
 							lib
 			           ) + ";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
diff --git a/uppsrc/ide/Builders/GccBuilder.icpp b/uppsrc/ide/Builders/GccBuilder.icpp
index 4e40ed921..2e5d3bcb7 100644
--- a/uppsrc/ide/Builders/GccBuilder.icpp
+++ b/uppsrc/ide/Builders/GccBuilder.icpp
@@ -74,11 +74,11 @@ bool GccBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
 		cc << " -arch i386";
 	}
 
-	if(HasFlag("SSE2")) {
-		cc << " -msse2";
-		if(!HasFlag("CLANG"))
-			cc << " -mfpmath=sse";
-	}
+//	if(HasFlag("SSE2")) {
+//		cc << " -msse2";
+//		if(!HasFlag("CLANG"))
+//			cc << " -mfpmath=sse";
+//	}
 
 	String cc_speed = cc;
 	bool   release = false;
diff --git a/uppsrc/ide/Builders/MscBuilder.icpp b/uppsrc/ide/Builders/MscBuilder.icpp
index a5a031be8..34c92acff 100644
--- a/uppsrc/ide/Builders/MscBuilder.icpp
+++ b/uppsrc/ide/Builders/MscBuilder.icpp
@@ -204,8 +204,8 @@ bool MscBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
 //	if(!HasFlag("MSC8")) // MSC8 does not support automatic precompiled headers...
 //		pch << " -YX -Fp" << GetHostPathQ(CatAnyPath(outdir, GetAnyFileName(package) + ".pch")) << ' ';
 //	cc << " -Gy -Fd" << pdb;
-	if(HasFlag("SSE2") && !IsMsc64())
-		cc << " /arch:SSE2";
+//	if(HasFlag("SSE2") && !IsMsc64())
+//		cc << " /arch:SSE2";
 	if(HasFlag("DEBUG_MINIMAL"))
 		cc << " -Zd";
 	if(HasFlag("DEBUG_FULL"))
diff --git a/uppsrc/ide/Builders/init b/uppsrc/ide/Builders/init
index ef2714dbd..186603321 100644
--- a/uppsrc/ide/Builders/init
+++ b/uppsrc/ide/Builders/init
@@ -1,19 +1,19 @@
 #ifndef _ide_Builders_icpp_init_stub
 #define _ide_Builders_icpp_init_stub
 #include "ide\Core/init"
-#define BLITZ_INDEX__ Faa75d2bc4f29046958482bddb44e5a75
+#define BLITZ_INDEX__ F2d0fda314d78470f3dad56fd15b06a6e
 #include "GccBuilder.icpp"
 #undef BLITZ_INDEX__
-#define BLITZ_INDEX__ Ff8a9076ba3ac55da766f2116257c319a
+#define BLITZ_INDEX__ F7230d617f2ab5db4a3338ada4ca8c292
 #include "MscBuilder.icpp"
 #undef BLITZ_INDEX__
-#define BLITZ_INDEX__ Fa36370997fd30cd3899a72b8795f7273
+#define BLITZ_INDEX__ Fa3cd12e35fe189283e40225675f9624c
 #include "OwcBuilder.icpp"
 #undef BLITZ_INDEX__
-#define BLITZ_INDEX__ Feeff7e9c12b8ac556d2f22af99215e54
+#define BLITZ_INDEX__ Fb879a0b9b41c914a5094d17fc0aea869
 #include "JavaBuilder.icpp"
 #undef BLITZ_INDEX__
-#define BLITZ_INDEX__ F6e9bd1871c8f271fc23a29fa3757caab
+#define BLITZ_INDEX__ F88cdfadd65244c54fcac6ffa7332b0cf
 #include "ScriptBuilder.icpp"
 #undef BLITZ_INDEX__
 #endif