| OLD | NEW |
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 # Due to an unfortunate intersection of lameness between gcc and gyp, | 3 # Due to an unfortunate intersection of lameness between gcc and gyp, |
| 4 # we have to build the *_SSE2.cpp files in a separate target. The | 4 # we have to build the *_SSE2.cpp files in a separate target. The |
| 5 # gcc lameness is that, in order to compile SSE2 intrinsics code, it | 5 # gcc lameness is that, in order to compile SSE2 intrinsics code, it |
| 6 # must be passed the -msse2 flag. However, with this flag, it may | 6 # must be passed the -msse2 flag. However, with this flag, it may |
| 7 # emit SSE2 instructions even for scalar code, such as the CPUID | 7 # emit SSE2 instructions even for scalar code, such as the CPUID |
| 8 # test used to test for the presence of SSE2. So that, and all other | 8 # test used to test for the presence of SSE2. So that, and all other |
| 9 # code must be compiled *without* -msse2. The gyp lameness is that it | 9 # code must be compiled *without* -msse2. The gyp lameness is that it |
| 10 # does not allow file-specific CFLAGS, so we must create this extra | 10 # does not allow file-specific CFLAGS, so we must create this extra |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 'standalone_static_library': 1, | 25 'standalone_static_library': 1, |
| 26 'include_dirs': [ | 26 'include_dirs': [ |
| 27 '../include/config', | 27 '../include/config', |
| 28 '../include/core', | 28 '../include/core', |
| 29 '../src/core', | 29 '../src/core', |
| 30 '../src/opts', | 30 '../src/opts', |
| 31 ], | 31 ], |
| 32 'conditions': [ | 32 'conditions': [ |
| 33 [ 'skia_arch_type == "x86" and skia_os != "ios"', { | 33 [ 'skia_arch_type == "x86" and skia_os != "ios"', { |
| 34 'conditions': [ | 34 'conditions': [ |
| 35 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { | 35 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "ch
romeos"]', { |
| 36 'cflags': [ | 36 'cflags': [ |
| 37 '-msse2', | 37 '-msse2', |
| 38 ], | 38 ], |
| 39 }], | 39 }], |
| 40 [ 'skia_os != "android"', { | 40 [ 'skia_os != "android"', { |
| 41 'dependencies': [ | 41 'dependencies': [ |
| 42 'opts_ssse3', | 42 'opts_ssse3', |
| 43 ], | 43 ], |
| 44 }], | 44 }], |
| 45 ], | 45 ], |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 'target_name': 'opts_ssse3', | 106 'target_name': 'opts_ssse3', |
| 107 'product_name': 'skia_opts_ssse3', | 107 'product_name': 'skia_opts_ssse3', |
| 108 'type': 'static_library', | 108 'type': 'static_library', |
| 109 'standalone_static_library': 1, | 109 'standalone_static_library': 1, |
| 110 'include_dirs': [ | 110 'include_dirs': [ |
| 111 '../include/config', | 111 '../include/config', |
| 112 '../include/core', | 112 '../include/core', |
| 113 '../src/core', | 113 '../src/core', |
| 114 ], | 114 ], |
| 115 'conditions': [ | 115 'conditions': [ |
| 116 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { | 116 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chrome
os"]', { |
| 117 'cflags': [ | 117 'cflags': [ |
| 118 '-mssse3', | 118 '-mssse3', |
| 119 ], | 119 ], |
| 120 }], | 120 }], |
| 121 # TODO(epoger): the following will enable SSSE3 on Macs, but it will | 121 # TODO(epoger): the following will enable SSSE3 on Macs, but it will |
| 122 # break once we set OTHER_CFLAGS anywhere else (the first setting will | 122 # break once we set OTHER_CFLAGS anywhere else (the first setting will |
| 123 # be replaced, not added to) | 123 # be replaced, not added to) |
| 124 [ 'skia_os in ["mac"]', { | 124 [ 'skia_os in ["mac"]', { |
| 125 'xcode_settings': { | 125 'xcode_settings': { |
| 126 'OTHER_CFLAGS': ['-mssse3',], | 126 'OTHER_CFLAGS': ['-mssse3',], |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 ], | 173 ], |
| 174 }, | 174 }, |
| 175 ], | 175 ], |
| 176 } | 176 } |
| 177 | 177 |
| 178 # Local Variables: | 178 # Local Variables: |
| 179 # tab-width:2 | 179 # tab-width:2 |
| 180 # indent-tabs-mode:nil | 180 # indent-tabs-mode:nil |
| 181 # End: | 181 # End: |
| 182 # vim: set expandtab tabstop=2 shiftwidth=2: | 182 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |