| Index: libjpeg.gyp
|
| diff --git a/libjpeg.gyp b/libjpeg.gyp
|
| index c5d8dce6978d652331b615e82299d966c64e1dde..56204792189288a116cbc5ccae8e501a4f3ed205 100644
|
| --- a/libjpeg.gyp
|
| +++ b/libjpeg.gyp
|
| @@ -6,6 +6,7 @@
|
| # This file is not used when use_system_libjpeg==1. Settings for building with
|
| # the system libjpeg is in third_party/libjpeg/libjpeg.gyp.
|
| 'variables': {
|
| + 'use_system_yasm%': 0,
|
| 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
|
| 'conditions': [
|
| [ 'OS=="win"', {
|
| @@ -101,59 +102,61 @@
|
| [ 'target_arch=="ia32"', {
|
| 'sources': [
|
| 'simd/jsimd_i386.c',
|
| - 'simd/jccolmmx.asm',
|
| - 'simd/jccolss2.asm',
|
| - 'simd/jcgrammx.asm',
|
| - 'simd/jcgrass2.asm',
|
| - 'simd/jcqnt3dn.asm',
|
| - 'simd/jcqntmmx.asm',
|
| - 'simd/jcqnts2f.asm',
|
| - 'simd/jcqnts2i.asm',
|
| - 'simd/jcqntsse.asm',
|
| - 'simd/jcsammmx.asm',
|
| - 'simd/jcsamss2.asm',
|
| - 'simd/jdcolmmx.asm',
|
| - 'simd/jdcolss2.asm',
|
| - 'simd/jdmermmx.asm',
|
| - 'simd/jdmerss2.asm',
|
| - 'simd/jdsammmx.asm',
|
| - 'simd/jdsamss2.asm',
|
| - 'simd/jf3dnflt.asm',
|
| - 'simd/jfmmxfst.asm',
|
| - 'simd/jfmmxint.asm',
|
| - 'simd/jfss2fst.asm',
|
| - 'simd/jfss2int.asm',
|
| - 'simd/jfsseflt.asm',
|
| - 'simd/ji3dnflt.asm',
|
| - 'simd/jimmxfst.asm',
|
| - 'simd/jimmxint.asm',
|
| - 'simd/jimmxred.asm',
|
| - 'simd/jiss2flt.asm',
|
| - 'simd/jiss2fst.asm',
|
| - 'simd/jiss2int.asm',
|
| - 'simd/jiss2red.asm',
|
| - 'simd/jisseflt.asm',
|
| + 'simd/jccolor-mmx.asm',
|
| + 'simd/jccolor-sse2.asm',
|
| + 'simd/jcgray-mmx.asm',
|
| + 'simd/jcgray-sse2.asm',
|
| + 'simd/jchuff-sse2.asm',
|
| + 'simd/jcsample-mmx.asm',
|
| + 'simd/jcsample-sse2.asm',
|
| + 'simd/jdcolor-mmx.asm',
|
| + 'simd/jdcolor-sse2.asm',
|
| + 'simd/jdmerge-mmx.asm',
|
| + 'simd/jdmerge-sse2.asm',
|
| + 'simd/jdsample-mmx.asm',
|
| + 'simd/jdsample-sse2.asm',
|
| + 'simd/jfdctflt-3dn.asm',
|
| + 'simd/jfdctflt-sse.asm',
|
| + 'simd/jfdctfst-mmx.asm',
|
| + 'simd/jfdctfst-sse2.asm',
|
| + 'simd/jfdctint-mmx.asm',
|
| + 'simd/jfdctint-sse2.asm',
|
| + 'simd/jidctflt-3dn.asm',
|
| + 'simd/jidctflt-sse2.asm',
|
| + 'simd/jidctflt-sse.asm',
|
| + 'simd/jidctfst-mmx.asm',
|
| + 'simd/jidctfst-sse2.asm',
|
| + 'simd/jidctint-mmx.asm',
|
| + 'simd/jidctint-sse2.asm',
|
| + 'simd/jidctred-mmx.asm',
|
| + 'simd/jidctred-sse2.asm',
|
| + 'simd/jquant-3dn.asm',
|
| + 'simd/jquantf-sse2.asm',
|
| + 'simd/jquanti-sse2.asm',
|
| + 'simd/jquant-mmx.asm',
|
| + 'simd/jquant-sse.asm',
|
| 'simd/jsimdcpu.asm',
|
| ],
|
| }],
|
| [ 'target_arch=="x64" and msan!=1', {
|
| 'sources': [
|
| 'simd/jsimd_x86_64.c',
|
| - 'simd/jccolss2-64.asm',
|
| - 'simd/jcgrass2-64.asm',
|
| - 'simd/jcqnts2f-64.asm',
|
| - 'simd/jcqnts2i-64.asm',
|
| - 'simd/jcsamss2-64.asm',
|
| - 'simd/jdcolss2-64.asm',
|
| - 'simd/jdmerss2-64.asm',
|
| - 'simd/jdsamss2-64.asm',
|
| - 'simd/jfss2fst-64.asm',
|
| - 'simd/jfss2int-64.asm',
|
| - 'simd/jfsseflt-64.asm',
|
| - 'simd/jiss2flt-64.asm',
|
| - 'simd/jiss2fst-64.asm',
|
| - 'simd/jiss2int-64.asm',
|
| - 'simd/jiss2red-64.asm',
|
| + 'simd/jccolor-sse2-64.asm',
|
| + 'simd/jcgray-sse2-64.asm',
|
| + 'simd/jchuff-sse2-64.asm',
|
| + 'simd/jcsample-sse2-64.asm',
|
| + 'simd/jdcolor-sse2-64.asm',
|
| + 'simd/jdmerge-sse2-64.asm',
|
| + 'simd/jdsample-sse2-64.asm',
|
| + 'simd/jfdctflt-sse-64.asm',
|
| + 'simd/jfdctfst-sse2-64.asm',
|
| + 'simd/jfdctint-sse2-64.asm',
|
| + 'simd/jidctflt-sse2-64.asm',
|
| + 'simd/jidctfst-sse2-64.asm',
|
| + 'simd/jidctint-sse2-64.asm',
|
| + 'simd/jidctred-sse2-64.asm',
|
| + 'simd/jquantf-sse2-64.asm',
|
| + 'simd/jquanti-sse2-64.asm',
|
| ],
|
| }],
|
| # MemorySanitizer doesn't support assembly code, so keep it disabled in
|
| @@ -207,7 +210,6 @@
|
| '-D__x86__',
|
| '-DWIN32',
|
| '-DMSVC',
|
| - '-Iwin/'
|
| ],
|
| }, {
|
| 'yasm_format': '-fwin64',
|
| @@ -215,7 +217,6 @@
|
| '-D__x86_64__',
|
| '-DWIN64',
|
| '-DMSVC',
|
| - '-Iwin/'
|
| ],
|
| }],
|
| ],
|
| @@ -233,14 +234,12 @@
|
| 'yasm_flags': [
|
| '-D__x86__',
|
| '-DMACHO',
|
| - '-Imac/'
|
| ],
|
| }, {
|
| 'yasm_format': '-fmacho64',
|
| 'yasm_flags': [
|
| '-D__x86_64__',
|
| '-DMACHO',
|
| - '-Imac/'
|
| ],
|
| }],
|
| ],
|
| @@ -266,14 +265,12 @@
|
| 'yasm_flags': [
|
| '-D__x86__',
|
| '-DELF',
|
| - '-Ilinux/'
|
| ],
|
| }, {
|
| 'yasm_format': '-felf64',
|
| 'yasm_flags': [
|
| '-D__x86_64__',
|
| '-DELF',
|
| - '-Ilinux/'
|
| ],
|
| }],
|
| ],
|
|
|