Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Gyp file for opts projects | 1 # Gyp file for opts projects |
| 2 { | 2 { |
| 3 'targets': [ | 3 'targets': [ |
| 4 # Due to an unfortunate intersection of lameness between gcc and gyp, | 4 # Due to an unfortunate intersection of lameness between gcc and gyp, |
| 5 # we have to build the *_SSE2.cpp files in a separate target. The | 5 # we have to build the *_SSE2.cpp files in a separate target. The |
| 6 # gcc lameness is that, in order to compile SSE2 intrinsics code, it | 6 # gcc lameness is that, in order to compile SSE2 intrinsics code, it |
| 7 # must be passed the -msse2 flag. However, with this flag, it may | 7 # must be passed the -msse2 flag. However, with this flag, it may |
| 8 # emit SSE2 instructions even for scalar code, such as the CPUID | 8 # emit SSE2 instructions even for scalar code, such as the CPUID |
| 9 # test used to test for the presence of SSE2. So that, and all other | 9 # test used to test for the presence of SSE2. So that, and all other |
| 10 # code must be compiled *without* -msse2. The gyp lameness is that it | 10 # code must be compiled *without* -msse2. The gyp lameness is that it |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 210 ], | 210 ], |
| 211 'include_dirs': [ | 211 'include_dirs': [ |
| 212 '../src/core', | 212 '../src/core', |
| 213 ], | 213 ], |
| 214 'conditions': [ | 214 'conditions': [ |
| 215 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chrome os", "android", "mac"] \ | 215 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chrome os", "android", "mac"] \ |
| 216 and not skia_android_framework', { | 216 and not skia_android_framework', { |
| 217 'cflags': [ | 217 'cflags': [ |
| 218 '-msse4', | 218 '-msse4', |
| 219 ], | 219 ], |
| 220 'OTHER_CPLUSPLUSFLAGS': [ | |
|
mtklein
2014/07/01 16:41:20
I think you will need to nest it inside 'xcode_set
henrik.smiding
2014/07/02 12:55:14
I'll try that!
| |
| 221 '-msse4', | |
| 222 ], | |
|
mtklein
2014/07/01 16:41:20
If that doesn't work, try also adding
'OTHER_CPLU
henrik.smiding
2014/07/02 12:55:14
I tried that in Patch set #4. Not nested in xcode_
| |
| 223 }], | |
| 224 [ 'skia_arch_type == "x86"', { | |
| 225 'sources': [ | |
| 226 '../src/opts/SkBlurImage_opts_SSE4.cpp', | |
| 227 ], | |
| 220 }], | 228 }], |
| 221 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { | 229 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { |
| 222 'sources': [ | 230 'sources': [ |
| 223 '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S', | 231 '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S', |
| 224 ], | 232 ], |
| 225 }], | 233 }], |
| 226 [ 'skia_arch_width == 32 and skia_arch_type == "x86"', { | 234 [ 'skia_arch_width == 32 and skia_arch_type == "x86"', { |
| 227 'sources': [ | 235 'sources': [ |
| 228 '../src/opts/SkBlitRow_opts_SSE4_asm.S', | 236 '../src/opts/SkBlitRow_opts_SSE4_asm.S', |
| 229 ], | 237 ], |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 273 '../src/opts/SkBitmapProcState_matrix_neon.h', | 281 '../src/opts/SkBitmapProcState_matrix_neon.h', |
| 274 '../src/opts/SkBlitMask_opts_arm_neon.cpp', | 282 '../src/opts/SkBlitMask_opts_arm_neon.cpp', |
| 275 '../src/opts/SkBlitRow_opts_arm_neon.cpp', | 283 '../src/opts/SkBlitRow_opts_arm_neon.cpp', |
| 276 '../src/opts/SkBlurImage_opts_neon.cpp', | 284 '../src/opts/SkBlurImage_opts_neon.cpp', |
| 277 '../src/opts/SkMorphology_opts_neon.cpp', | 285 '../src/opts/SkMorphology_opts_neon.cpp', |
| 278 '../src/opts/SkXfermode_opts_arm_neon.cpp', | 286 '../src/opts/SkXfermode_opts_arm_neon.cpp', |
| 279 ], | 287 ], |
| 280 }, | 288 }, |
| 281 ], | 289 ], |
| 282 } | 290 } |
| OLD | NEW |