buildSrc/win.gradle

Print this page
rev 8319 : RT-39262: Remove /arch:SSE from 64-bit Windows build

@@ -169,11 +169,11 @@
         "/DELAYLOAD:Uiautomationcore.dll", "/DELAYLOAD:dwmapi.dll"].flatten()
 WIN.glass.lib = "glass"
 
 WIN.decora = [:]
 WIN.decora.compiler = compiler
-WIN.decora.ccFlags = ["/arch:SSE", "/fp:fast", ccFlags].flatten()
+WIN.decora.ccFlags = [ IS_64 ? [] : ["/arch:SSE"], "/fp:fast", ccFlags].flatten()
 WIN.decora.linker = linker
 WIN.decora.linkFlags = [linkFlags].flatten()
 WIN.decora.lib = "decora_sse"
 WIN.decora.rcCompiler = rcCompiler;
 WIN.decora.rcSource = defaultRcSource

@@ -219,11 +219,11 @@
 
 WIN.launcher = [:]
 WIN.launcher.compiler = compiler
 WIN.launcher.ccFlags = ["/nologo", "/W3", "/EHsc", "/D_WINDOWS", "/DUNICODE", "/D_UNICODE", "/DWIN32",
         "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN", "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
-        "/arch:SSE", "/fp:fast",
+        IS_64 ? [] : ["/arch:SSE"], "/fp:fast",
         IS_DEBUG_NATIVE ? ["/MDd", "/Od", "/Zi", "/FS", "/DDEBUG"] : ["/O2", "/MD", "/DNDEBUG"]].flatten();
 WIN.launcher.linker = linker
 WIN.launcher.linkFlags = ["/link", "/nologo", "/WX", "/SUBSYSTEM:WINDOWS", "user32.lib", "shell32.lib", "advapi32.lib"]
 if (IS_DEBUG_NATIVE) WIN.launcher.linkFlags.add("/debug");
 

@@ -231,32 +231,33 @@
 WIN.launcherlibrary.compiler = compiler
 WIN.launcherlibrary.ccFlags = ["/nologo", "/W3",
         // "/WX",
         "/EHsc", "/c", "/D_WINDOWS", "/DUNICODE", "/D_UNICODE", "/DWIN32",
         "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN", "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
-        "/arch:SSE", "/fp:fast",
+        IS_64 ? [] : ["/arch:SSE"], "/fp:fast",
         IS_DEBUG_NATIVE ? ["/MDd", "/Od", "/Zi", "/FS", "/DDEBUG"] : ["/O2", "/MD", "/DNDEBUG"]].flatten();
 WIN.launcherlibrary.linker = linker
 WIN.launcherlibrary.linkFlags = ["/nologo", "/WX", "/DLL", "/SUBSYSTEM:WINDOWS", "user32.lib", "shell32.lib", "advapi32.lib", "ole32.lib"]
 if (IS_DEBUG_NATIVE) WIN.launcherlibrary.linkFlags.add("/debug");
 
 WIN.iconLauncher = [:]
 WIN.iconLauncher.compiler = compiler
 WIN.iconLauncher.ccFlags = ["/nologo", "/W3", "/EHsc", "/D_WINDOWS", "/DUNICODE", "/D_UNICODE",
-        "/arch:SSE", "/fp:fast", "/O2"]
+        IS_64 ? [] : ["/arch:SSE"], "/fp:fast", "/O2"].flatten();
 WIN.iconLauncher.linker = linker
 WIN.iconLauncher.linkFlags = ["/link", "/nologo", "/SUBSYSTEM:CONSOLE"];
 
 WIN.fxpackager = [:]
 WIN.fxpackager.nativeSource = [
     file("modules/fxpackager/src/main/native/javapackager/win")]
 WIN.fxpackager.compiler = compiler
 WIN.fxpackager.ccFlags = ["/nologo", "/W3", "/EHsc", "/MT", "/GS",
                     "/DWIN32", "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN",
                     "/D_WIN32_WINDOWS=0X0500", "/D_WIN32_WINNT=0X0500",
-                    "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32", "/arch:SSE", "/fp:fast",
-                    "/O2", "-c"]
+                    "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
+                    IS_64 ? [] : ["/arch:SSE"], "/fp:fast",
+                    "/O2", "-c"].flatten();
 WIN.fxpackager.linker = linker
 
 WIN.iio = [:]
 WIN.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 WIN.iio.nativeSource = [