| 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 25 matching lines...) Expand all  Loading... | 
|   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           ], | 
 |   46           'include_dirs': [ | 
 |   47             '../include/utils', | 
 |   48           ], | 
|   46           'sources': [ |   49           'sources': [ | 
|   47             '../src/opts/opts_check_SSE2.cpp', |   50             '../src/opts/opts_check_SSE2.cpp', | 
|   48             '../src/opts/SkBitmapProcState_opts_SSE2.cpp', |   51             '../src/opts/SkBitmapProcState_opts_SSE2.cpp', | 
 |   52             '../src/opts/SkBitmapFilter_opts_SSE2.cpp', | 
|   49             '../src/opts/SkBlitRow_opts_SSE2.cpp', |   53             '../src/opts/SkBlitRow_opts_SSE2.cpp', | 
|   50             '../src/opts/SkBlitRect_opts_SSE2.cpp', |   54             '../src/opts/SkBlitRect_opts_SSE2.cpp', | 
|   51             '../src/opts/SkUtils_opts_SSE2.cpp', |   55             '../src/opts/SkUtils_opts_SSE2.cpp', | 
|   52           ], |   56           ], | 
|   53         }], |   57         }], | 
|   54         [ 'skia_arch_type == "arm" and armv7 == 1', { |   58         [ 'skia_arch_type == "arm" and armv7 == 1', { | 
|   55           # The assembly uses the frame pointer register (r7 in Thumb/r11 in |   59           # The assembly uses the frame pointer register (r7 in Thumb/r11 in | 
|   56           # ARM), the compiler doesn't like that. |   60           # ARM), the compiler doesn't like that. | 
|   57           'cflags!': [ |   61           'cflags!': [ | 
|   58             '-fno-omit-frame-pointer', |   62             '-fno-omit-frame-pointer', | 
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  173       ], |  177       ], | 
|  174     }, |  178     }, | 
|  175   ], |  179   ], | 
|  176 } |  180 } | 
|  177  |  181  | 
|  178 # Local Variables: |  182 # Local Variables: | 
|  179 # tab-width:2 |  183 # tab-width:2 | 
|  180 # indent-tabs-mode:nil |  184 # indent-tabs-mode:nil | 
|  181 # End: |  185 # End: | 
|  182 # vim: set expandtab tabstop=2 shiftwidth=2: |  186 # vim: set expandtab tabstop=2 shiftwidth=2: | 
| OLD | NEW |