commit e2c7154e1a915b83551cf90983ec8f576032e4fe
author Alexis Hetu <sugoi@google.com> Tue Feb 07 15:47:27 2017 -0500
committer Alexis Hétu <sugoi@google.com> Tue Feb 07 20:53:48 2017 +0000
tree 2d81489e55186baa3957e5f54c4579786af48046
parent 8560e6877b10b9f0fea712cb6ef52dcc3fc69747

Cleaning up BUILD.gn file before Chromium DEPS update

Cleaned up a few things before updating SwiftShader's version
in Chromium's DEPS file:
- Added Windows Subzero fix
- Removed commented out sysroot related lines
- Fixed formatting using git
- Temporarily disabled Subzero compilation for now

Change-Id: Ib6ae75c20869522675d28086ab170f01fd730f93
Reviewed-on: https://swiftshader-review.googlesource.com/8709
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/Reactor/BUILD.gn

diff --git a/src/Reactor/BUILD.gn b/src/Reactor/BUILD.gn
index 87b1bd8..dccf4cd 100644
--- a/src/Reactor/BUILD.gn
+++ b/src/Reactor/BUILD.gn
@@ -25,6 +25,10 @@
     "ICE_THREAD_LOCAL_HACK=0",
   ]
 
+  if (is_win) {
+    defines += [ "SUBZERO_USE_MICROSOFT_ABI" ]
+  }
+
   if (target_cpu == "x64") {
     defines += [
       "SZTARGET=X8664",
@@ -53,7 +57,6 @@
 }
 
 config("swiftshader_subzero_private_config") {
-#  cflags_cc = [ "--sysroot=/" ] #FIXME
   cflags = []
 
   if (is_win) {
@@ -93,7 +96,6 @@
 }
 
 config("swiftshader_reactor_with_subzero_private_config") {
-#  cflags_cc = [ "--sysroot=/" ] #FIXME
   cflags = []
 
   if (is_win) {
@@ -232,15 +234,19 @@
 }
 
 source_set("swiftshader_reactor") {
-  deps = [ "../OpenGL/common:swiftshader_opengl_common" ]
+  deps = [
+    "../OpenGL/common:swiftshader_opengl_common",
+  ]
 
-  sources = [ "Routine.cpp" ]
+  sources = [
+    "Routine.cpp",
+  ]
 
   # Currently, Subzero will only be used on Windows
   # LLVM will be used on Linux and MacOS
-  use_subzero = is_win
+  use_subzero = false
 
-  if(use_subzero) {
+  if (use_subzero) {
     deps += [ ":swiftshader_subzero" ]
 
     sources += [