Index: cc/cc.gyp |
diff --git a/cc/cc.gyp b/cc/cc.gyp |
index aeea01861d2ddf3def9fef729e6beab473b21f60..580b80b34800133de397f7341d20678a8e4dfef4 100644 |
--- a/cc/cc.gyp |
+++ b/cc/cc.gyp |
@@ -20,6 +20,7 @@ |
'<(DEPTH)/ui/events/events.gyp:events_base', |
'<(DEPTH)/ui/gfx/gfx.gyp:gfx', |
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', |
+ 'cc_opts', |
], |
'variables': { |
'optimize': 'max', |
@@ -487,6 +488,7 @@ |
'resources/texture_compressor.h', |
'resources/texture_compressor_etc1.cc', |
'resources/texture_compressor_etc1.h', |
+ 'resources/texture_compressor_util.h', |
'resources/texture_mailbox.cc', |
'resources/texture_mailbox.h', |
'resources/texture_mailbox_deleter.cc', |
@@ -630,5 +632,50 @@ |
'../build/android/increase_size_for_speed.gypi', |
], |
}, |
+ { |
+ 'target_name': 'cc_opts', |
+ 'type': 'static_library', |
+ 'conditions': [ |
+ [ |
+# 'target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { |
+# 'defines': [ |
+# 'CC_IMPLEMENTATION=1', |
+# ], |
+# 'dependencies': [ |
+# 'cc_opts_neon', |
+# ] |
+# }, |
+ 'target_arch == "ia32" or target_arch == "x64"', { |
+ 'defines': [ |
+ 'CC_IMPLEMENTATION=1', |
+ ], |
+ 'dependencies': [ |
+ 'cc_opts_sse', |
+ ] |
+ }], |
+ ], |
+ }, |
+ { |
+ 'target_name': 'cc_opts_sse', |
+ 'type': 'static_library', |
+ 'dependencies': [ |
+ '<(DEPTH)/base/base.gyp:base', |
+ ], |
+ 'conditions': [ |
+ ['target_arch == "ia32" or target_arch == "x64"', { |
+ 'defines': [ |
+ 'CC_IMPLEMENTATION=1', |
+ ], |
+ 'sources': [ |
+ # Conditional compilation for SSE2 code on x86 and x64 machines |
+ 'resources/texture_compressor_etc1_sse.cc', |
+ 'resources/texture_compressor_etc1_sse.h', |
+ ], |
+ 'cflags': [ |
+ '-msse2', |
+ ], |
+ }], |
+ ], |
+ }, |
], |
} |