Make Blitter part of Renderer.

[android-x86/external-swiftshader.git] / BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 57cbf33..52a78e8 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,34 +12,42 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build/config/compiler/compiler.gni")
+
 config("swiftshader_config") {
+  defines = [ "STRICT_CONFORMANCE" ]  # Disables OpenGL ES 3.0
+
   if (is_win) {
     cflags = [
       "/GS",  # Detects some buffer overruns
       "/Zc:wchar_t",
-      "/D_CRT_SECURE_NO_DEPRECATE",
-      "/DNOMINMAX",
-      "/D_WINDLL",
       "/EHsc",
       "/nologo",
       "/Gd",  # Default calling convention
-      "/DSTRICT_CONFORMANCE", # Disables OpenGL ES 3.0
+    ]
+
+    defines += [
+      "_CRT_SECURE_NO_DEPRECATE",
+      "NOMINMAX",
+      "_WINDLL",
     ]
 
     if (is_debug) {
       cflags += [ "/RTC1" ]  # Run-Time Error Checks
     } else {
-      cflags += [ "/DANGLE_DISABLE_TRACE" ]
+      defines += [ "ANGLE_DISABLE_TRACE" ]
     }
   } else {
     cflags = [
       "-std=c++11",
       "-Wall",
-      "-fexceptions",
+      "-fno-exceptions",
       "-fno-operator-names",
-      "-D__STDC_CONSTANT_MACROS",
-      "-D__STDC_LIMIT_MACROS",
-      "-DSTRICT_CONFORMANCE", # Disables OpenGL ES 3.0
+    ]
+
+    defines += [
+      "__STDC_CONSTANT_MACROS",
+      "__STDC_LIMIT_MACROS",
     ]
 
     if (is_debug) {
@@ -53,11 +61,13 @@ config("swiftshader_config") {
         "-ffunction-sections",
         "-fdata-sections",
         "-fomit-frame-pointer",
-        "-DANGLE_DISABLE_TRACE",
-        "-DNDEBUG",
-        "-O2",
         "-Os",
       ]
+
+      defines += [
+        "ANGLE_DISABLE_TRACE",
+        "NDEBUG",
+      ]
     }
 
     if (target_cpu == "x64") {  # 64 bit version
@@ -79,6 +89,12 @@ config("swiftshader_config") {
         "-Wl,--hash-style=both",
         "-Wl,--gc-sections",
       ]
+      # A bug in the gold linker prevents using ICF on 32-bit (crbug.com/729532)
+      if (use_gold && target_cpu == "x86") {
+        ldflags += [
+          "-Wl,--icf=none",
+        ]
+      }
     }
   }
 }