Enable the SSSE3 compile time check on all platforms (4th attempt)

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 0c1bc0a0c9b07aa20882961fa2732a823715dd8e..55306e4ee106c442c3d8bb547333730de7f72eec 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -188,19 +188,20 @@
         '../src/core',
         '../src/utils',
       ],
+      'sources': [
+        '../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
+      ],
       'conditions': [
+        [ 'skia_os == "win"', {
+            'defines' : [ 'SK_CPU_SSE_LEVEL=31' ],
+        }],
+        # (Mac has -mssse3 globally.)
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
            and not skia_android_framework', {
           'cflags': [
             '-mssse3',
           ],
         }],
-        # (Mac has -mssse3 globally.)
-        [ 'skia_arch_type == "x86"', {
-          'sources': [
-            '../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
-          ],
-        }],
       ],
     },
     # For the same lame reasons as what is done for skia_opts, we also have to
@@ -220,11 +221,27 @@
         '../src/core',
         '../src/utils',
       ],
+      'sources': [
+        '../src/opts/SkBlurImage_opts_SSE4.cpp',
+      ],
       'conditions': [
+        [ 'skia_arch_width == 64', {
+          'sources': [
+            '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
+          ],
+        }],
+        [ 'skia_arch_width == 32', {
+          'sources': [
+            '../src/opts/SkBlitRow_opts_SSE4_asm.S',
+          ],
+        }],
+        [ 'skia_os == "win"', {
+            'defines' : [ 'SK_CPU_SSE_LEVEL=41' ],
+        }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
            and not skia_android_framework', {
           'cflags': [
-            '-msse4',
+            '-msse4.1',
           ],
         }],
         [ 'skia_os == "mac"', {
@@ -233,27 +250,10 @@
               '-mssse3',
             ],
             'OTHER_CPLUSPLUSFLAGS': [
-              '-msse4',
+              '-msse4.1',
             ],
           },
         }],
-        [ 'skia_arch_type == "x86"', {
-          'sources': [
-            '../src/opts/SkBlurImage_opts_SSE4.cpp',
-          ],
-          'conditions': [
-            [ 'skia_arch_width == 64', {
-              'sources': [
-                '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
-              ],
-            }],
-            [ 'skia_arch_width == 32', {
-              'sources': [
-                '../src/opts/SkBlitRow_opts_SSE4_asm.S',
-              ],
-            }],
-          ],
-        }],
       ],
     },
     # NEON code must be compiled with -mfpu=neon which also affects scalar