Using subdirectories unfortunately opened up a can of worms. In order to prevent object name conflicts, it is necessary to use the subdir-objects automake directive, but it simply doesn't work right on some of the versions of automake we still have to support. Another option would be to add a separate Makefile.am file to each subdirectory, but that requires maintaining a completely different set of build rules for each one. Fortunately, however, we're in the 21st century now, so we can use filenames longer than 8.3.

This commit is contained in:
DRC
2014-05-10 09:53:34 +00:00
parent 6af3f00efa
commit 1bd801a872
60 changed files with 120 additions and 126 deletions

View File

@@ -3,58 +3,52 @@ noinst_LTLIBRARIES = libsimd.la
BUILT_SOURCES = jsimdcfg.inc
EXTRA_DIST = nasm_lt.sh CMakeLists.txt \
i386-mmx/jccolext.asm i386-mmx/jcgryext.asm i386-mmx/jdcolext.asm \
i386-mmx/jdmrgext.asm \
i386-sse2/jccolext.asm i386-sse2/jcgryext.asm i386-sse2/jdcolext.asm \
i386-sse2/jdmrgext.asm \
x86_64-sse2/jccolext.asm x86_64-sse2/jcgryext.asm x86_64-sse2/jdcolext.asm \
x86_64-sse2/jdmrgext.asm
jccolext-mmx.asm jcgryext-mmx.asm jdcolext-mmx.asm jdmrgext-mmx.asm \
jccolext-sse2.asm jcgryext-sse2.asm jdcolext-sse2.asm jdmrgext-sse2.asm \
jccolext-sse2-64.asm jcgryext-sse2-64.asm jdcolext-sse2-64.asm \
jdmrgext-sse2-64.asm
if SIMD_X86_64
libsimd_la_SOURCES = jsimd_x86_64.c \
jsimd.h jsimdcfg.inc.h \
jsimdext.inc jcolsamp.inc jdct.inc \
x86_64-sse/jfdctflt.asm x86_64-sse2/jcgray.asm \
x86_64-sse2/jccolor.asm x86_64-sse2/jdcolor.asm \
x86_64-sse2/jcsample.asm x86_64-sse2/jdsample.asm x86_64-sse2/jdmerge.asm \
x86_64-sse2/jquanti.asm x86_64-sse2/jfdctfst.asm x86_64-sse2/jfdctint.asm \
x86_64-sse2/jidctred.asm x86_64-sse2/jidctint.asm x86_64-sse2/jidctfst.asm \
x86_64-sse2/jquantf.asm x86_64-sse2/jidctflt.asm
libsimd_la_SOURCES = jsimd_x86_64.c jsimd.h jsimdcfg.inc.h jsimdext.inc \
jcolsamp.inc jdct.inc jfdctflt-sse-64.asm \
jccolor-sse2-64.asm jcgray-sse2-64.asm jcsample-sse2-64.asm \
jdcolor-sse2-64.asm jdmerge-sse2-64.asm jdsample-sse2-64.asm \
jfdctfst-sse2-64.asm jfdctint-sse2-64.asm jidctflt-sse2-64.asm \
jidctfst-sse2-64.asm jidctint-sse2-64.asm jidctred-sse2-64.asm \
jquantf-sse2-64.asm jquanti-sse2-64.asm
x86_64-sse2/jccolor.lo: x86_64-sse2/jccolext.asm
x86_64-sse2/jcgray.lo: x86_64-sse2/jcgryext.asm
x86_64-sse2/jdcolor.lo: x86_64-sse2/jdcolext.asm
x86_64-sse2/jdmerge.lo: x86_64-sse2/jdmrgext.asm
jccolor-sse2-64.lo: jccolext-sse2-64.asm
jcgray-sse2-64.lo: jcgryext-sse2-64.asm
jdcolor-sse2-64.lo: jdcolext-sse2-64.asm
jdmerge-sse2-64.lo: jdmrgext-sse2-64.asm
endif
if SIMD_I386
libsimd_la_SOURCES = jsimd_i386.c \
jsimd.h jsimdcfg.inc.h \
jsimdext.inc jcolsamp.inc jdct.inc \
jsimdcpu.asm \
i386-mmx/jccolor.asm i386-mmx/jdcolor.asm i386-mmx/jcgray.asm \
i386-mmx/jcsample.asm i386-mmx/jdsample.asm i386-mmx/jdmerge.asm \
i386-mmx/jquant.asm i386-mmx/jfdctfst.asm i386-mmx/jfdctint.asm \
i386-mmx/jidctred.asm i386-mmx/jidctint.asm i386-mmx/jidctfst.asm \
i386-3dnow/jquant.asm i386-3dnow/jfdctflt.asm i386-3dnow/jidctflt.asm \
i386-sse/jquant.asm i386-sse/jfdctflt.asm i386-sse/jidctflt.asm \
i386-sse2/jccolor.asm i386-sse2/jdcolor.asm i386-sse2/jcgray.asm \
i386-sse2/jcsample.asm i386-sse2/jdsample.asm i386-sse2/jdmerge.asm \
i386-sse2/jquanti.asm i386-sse2/jfdctfst.asm i386-sse2/jfdctint.asm \
i386-sse2/jidctred.asm i386-sse2/jidctint.asm i386-sse2/jidctfst.asm \
i386-sse2/jquantf.asm i386-sse2/jidctflt.asm
libsimd_la_SOURCES = jsimd_i386.c jsimd.h jsimdcfg.inc.h jsimdext.inc \
jcolsamp.inc jdct.inc jsimdcpu.asm \
jfdctflt-3dn.asm jidctflt-3dn.asm jquant-3dn.asm \
jccolor-mmx.asm jcgray-mmx.asm jcsample-mmx.asm \
jdcolor-mmx.asm jdmerge-mmx.asm jdsample-mmx.asm \
jfdctfst-mmx.asm jfdctint-mmx.asm jidctfst-mmx.asm \
jidctint-mmx.asm jidctred-mmx.asm jquant-mmx.asm \
jfdctflt-sse.asm jidctflt-sse.asm jquant-sse.asm \
jccolor-sse2.asm jcgray-sse2.asm jcsample-sse2.asm \
jdcolor-sse2.asm jdmerge-sse2.asm jdsample-sse2.asm \
jfdctfst-sse2.asm jfdctint-sse2.asm jidctflt-sse2.asm \
jidctfst-sse2.asm jidctint-sse2.asm jidctred-sse2.asm \
jquantf-sse2.asm jquanti-sse2.asm
i386-mmx/jccolor.lo: i386-mmx/jccolext.asm
i386-mmx/jcgray.lo: i386-mmx/jcgryext.asm
i386-mmx/jdcolor.lo: i386-mmx/jdcolext.asm
i386-mmx/jdmerge.lo: i386-mmx/jdmrgext.asm
i386-sse2/jccolor.lo: i386-sse2/jccolext.asm
i386-sse2/jcgray.lo: i386-sse2/jcgryext.asm
i386-sse2/jdcolor.lo: i386-sse2/jdcolext.asm
i386-sse2/jdmerge.lo: i386-sse2/jdmrgext.asm
jccolor-mmx.lo: jccolext-mmx.asm
jcgray.-mmx.lo: jcgryext-mmx.asm
jdcolor-mmx.lo: jdcolext-mmx.asm
jdmerge-mmx.lo: jdmrgext-mmx.asm
jccolor-sse2.lo: jccolext-sse2.asm
jcgray-sse2.lo: jcgryext-sse2.asm
jdcolor-sse2.lo: jdcolext-sse2.asm
jdmerge-sse2.lo: jdmrgext-sse2.asm
endif

View File

@@ -54,7 +54,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
SECTION SEG_TEXT
BITS 32
%include "i386-mmx/jccolext.asm"
%include "jccolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -65,7 +65,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_rgb_ycc_convert_mmx jsimd_extrgb_ycc_convert_mmx
%include "i386-mmx/jccolext.asm"
%include "jccolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -76,7 +76,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_rgb_ycc_convert_mmx jsimd_extrgbx_ycc_convert_mmx
%include "i386-mmx/jccolext.asm"
%include "jccolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -87,7 +87,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_rgb_ycc_convert_mmx jsimd_extbgr_ycc_convert_mmx
%include "i386-mmx/jccolext.asm"
%include "jccolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -98,7 +98,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_rgb_ycc_convert_mmx jsimd_extbgrx_ycc_convert_mmx
%include "i386-mmx/jccolext.asm"
%include "jccolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -109,7 +109,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_rgb_ycc_convert_mmx jsimd_extxbgr_ycc_convert_mmx
%include "i386-mmx/jccolext.asm"
%include "jccolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -120,4 +120,4 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_rgb_ycc_convert_mmx jsimd_extxrgb_ycc_convert_mmx
%include "i386-mmx/jccolext.asm"
%include "jccolext-mmx.asm"

View File

@@ -51,7 +51,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
SECTION SEG_TEXT
BITS 64
%include "x86_64-sse2/jccolext.asm"
%include "jccolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -62,7 +62,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extrgb_ycc_convert_sse2
%include "x86_64-sse2/jccolext.asm"
%include "jccolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -73,7 +73,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extrgbx_ycc_convert_sse2
%include "x86_64-sse2/jccolext.asm"
%include "jccolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -84,7 +84,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extbgr_ycc_convert_sse2
%include "x86_64-sse2/jccolext.asm"
%include "jccolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -95,7 +95,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extbgrx_ycc_convert_sse2
%include "x86_64-sse2/jccolext.asm"
%include "jccolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -106,7 +106,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extxbgr_ycc_convert_sse2
%include "x86_64-sse2/jccolext.asm"
%include "jccolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -117,4 +117,4 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extxrgb_ycc_convert_sse2
%include "x86_64-sse2/jccolext.asm"
%include "jccolext-sse2-64.asm"

View File

@@ -51,7 +51,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
SECTION SEG_TEXT
BITS 32
%include "i386-sse2/jccolext.asm"
%include "jccolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -62,7 +62,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extrgb_ycc_convert_sse2
%include "i386-sse2/jccolext.asm"
%include "jccolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -73,7 +73,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extrgbx_ycc_convert_sse2
%include "i386-sse2/jccolext.asm"
%include "jccolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -84,7 +84,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extbgr_ycc_convert_sse2
%include "i386-sse2/jccolext.asm"
%include "jccolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -95,7 +95,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extbgrx_ycc_convert_sse2
%include "i386-sse2/jccolext.asm"
%include "jccolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -106,7 +106,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extxbgr_ycc_convert_sse2
%include "i386-sse2/jccolext.asm"
%include "jccolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -117,4 +117,4 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_rgb_ycc_convert_sse2 jsimd_extxrgb_ycc_convert_sse2
%include "i386-sse2/jccolext.asm"
%include "jccolext-sse2.asm"

View File

@@ -47,7 +47,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
SECTION SEG_TEXT
BITS 32
%include "i386-mmx/jcgryext.asm"
%include "jcgryext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -58,7 +58,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_rgb_gray_convert_mmx jsimd_extrgb_gray_convert_mmx
%include "i386-mmx/jcgryext.asm"
%include "jcgryext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -69,7 +69,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_rgb_gray_convert_mmx jsimd_extrgbx_gray_convert_mmx
%include "i386-mmx/jcgryext.asm"
%include "jcgryext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -80,7 +80,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_rgb_gray_convert_mmx jsimd_extbgr_gray_convert_mmx
%include "i386-mmx/jcgryext.asm"
%include "jcgryext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -91,7 +91,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_rgb_gray_convert_mmx jsimd_extbgrx_gray_convert_mmx
%include "i386-mmx/jcgryext.asm"
%include "jcgryext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -102,7 +102,7 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_rgb_gray_convert_mmx jsimd_extxbgr_gray_convert_mmx
%include "i386-mmx/jcgryext.asm"
%include "jcgryext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -113,4 +113,4 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_rgb_gray_convert_mmx jsimd_extxrgb_gray_convert_mmx
%include "i386-mmx/jcgryext.asm"
%include "jcgryext-mmx.asm"

View File

@@ -44,7 +44,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
SECTION SEG_TEXT
BITS 64
%include "x86_64-sse2/jcgryext.asm"
%include "jcgryext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -55,7 +55,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extrgb_gray_convert_sse2
%include "x86_64-sse2/jcgryext.asm"
%include "jcgryext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -66,7 +66,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extrgbx_gray_convert_sse2
%include "x86_64-sse2/jcgryext.asm"
%include "jcgryext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -77,7 +77,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extbgr_gray_convert_sse2
%include "x86_64-sse2/jcgryext.asm"
%include "jcgryext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -88,7 +88,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extbgrx_gray_convert_sse2
%include "x86_64-sse2/jcgryext.asm"
%include "jcgryext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -99,7 +99,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extxbgr_gray_convert_sse2
%include "x86_64-sse2/jcgryext.asm"
%include "jcgryext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -110,4 +110,4 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extxrgb_gray_convert_sse2
%include "x86_64-sse2/jcgryext.asm"
%include "jcgryext-sse2-64.asm"

View File

@@ -44,7 +44,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
SECTION SEG_TEXT
BITS 32
%include "i386-sse2/jcgryext.asm"
%include "jcgryext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -55,7 +55,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extrgb_gray_convert_sse2
%include "i386-sse2/jcgryext.asm"
%include "jcgryext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -66,7 +66,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extrgbx_gray_convert_sse2
%include "i386-sse2/jcgryext.asm"
%include "jcgryext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -77,7 +77,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extbgr_gray_convert_sse2
%include "i386-sse2/jcgryext.asm"
%include "jcgryext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -88,7 +88,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extbgrx_gray_convert_sse2
%include "i386-sse2/jcgryext.asm"
%include "jcgryext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -99,7 +99,7 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extxbgr_gray_convert_sse2
%include "i386-sse2/jcgryext.asm"
%include "jcgryext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -110,4 +110,4 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_rgb_gray_convert_sse2 jsimd_extxrgb_gray_convert_sse2
%include "i386-sse2/jcgryext.asm"
%include "jcgryext-sse2.asm"

View File

@@ -51,7 +51,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
SECTION SEG_TEXT
BITS 32
%include "i386-mmx/jdcolext.asm"
%include "jdcolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -62,7 +62,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_ycc_rgb_convert_mmx jsimd_ycc_extrgb_convert_mmx
%include "i386-mmx/jdcolext.asm"
%include "jdcolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -73,7 +73,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_ycc_rgb_convert_mmx jsimd_ycc_extrgbx_convert_mmx
%include "i386-mmx/jdcolext.asm"
%include "jdcolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -84,7 +84,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_ycc_rgb_convert_mmx jsimd_ycc_extbgr_convert_mmx
%include "i386-mmx/jdcolext.asm"
%include "jdcolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -95,7 +95,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_ycc_rgb_convert_mmx jsimd_ycc_extbgrx_convert_mmx
%include "i386-mmx/jdcolext.asm"
%include "jdcolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -106,7 +106,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_ycc_rgb_convert_mmx jsimd_ycc_extxbgr_convert_mmx
%include "i386-mmx/jdcolext.asm"
%include "jdcolext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -117,4 +117,4 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_ycc_rgb_convert_mmx jsimd_ycc_extxrgb_convert_mmx
%include "i386-mmx/jdcolext.asm"
%include "jdcolext-mmx.asm"

View File

@@ -51,7 +51,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
SECTION SEG_TEXT
BITS 64
%include "x86_64-sse2/jdcolext.asm"
%include "jdcolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -62,7 +62,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extrgb_convert_sse2
%include "x86_64-sse2/jdcolext.asm"
%include "jdcolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -73,7 +73,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extrgbx_convert_sse2
%include "x86_64-sse2/jdcolext.asm"
%include "jdcolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -84,7 +84,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extbgr_convert_sse2
%include "x86_64-sse2/jdcolext.asm"
%include "jdcolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -95,7 +95,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extbgrx_convert_sse2
%include "x86_64-sse2/jdcolext.asm"
%include "jdcolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -106,7 +106,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extxbgr_convert_sse2
%include "x86_64-sse2/jdcolext.asm"
%include "jdcolext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -117,4 +117,4 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extxrgb_convert_sse2
%include "x86_64-sse2/jdcolext.asm"
%include "jdcolext-sse2-64.asm"

View File

@@ -51,7 +51,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
SECTION SEG_TEXT
BITS 32
%include "i386-sse2/jdcolext.asm"
%include "jdcolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -62,7 +62,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extrgb_convert_sse2
%include "i386-sse2/jdcolext.asm"
%include "jdcolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -73,7 +73,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extrgbx_convert_sse2
%include "i386-sse2/jdcolext.asm"
%include "jdcolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -84,7 +84,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extbgr_convert_sse2
%include "i386-sse2/jdcolext.asm"
%include "jdcolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -95,7 +95,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extbgrx_convert_sse2
%include "i386-sse2/jdcolext.asm"
%include "jdcolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -106,7 +106,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extxbgr_convert_sse2
%include "i386-sse2/jdcolext.asm"
%include "jdcolext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -117,4 +117,4 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_ycc_rgb_convert_sse2 jsimd_ycc_extxrgb_convert_sse2
%include "i386-sse2/jdcolext.asm"
%include "jdcolext-sse2.asm"

View File

@@ -51,7 +51,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
SECTION SEG_TEXT
BITS 32
%include "i386-mmx/jdmrgext.asm"
%include "jdmrgext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -63,7 +63,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extrgb_merged_upsample_mmx
%define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extrgb_merged_upsample_mmx
%include "i386-mmx/jdmrgext.asm"
%include "jdmrgext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -75,7 +75,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extrgbx_merged_upsample_mmx
%define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extrgbx_merged_upsample_mmx
%include "i386-mmx/jdmrgext.asm"
%include "jdmrgext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -87,7 +87,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extbgr_merged_upsample_mmx
%define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extbgr_merged_upsample_mmx
%include "i386-mmx/jdmrgext.asm"
%include "jdmrgext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -99,7 +99,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extbgrx_merged_upsample_mmx
%define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extbgrx_merged_upsample_mmx
%include "i386-mmx/jdmrgext.asm"
%include "jdmrgext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -111,7 +111,7 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extxbgr_merged_upsample_mmx
%define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extxbgr_merged_upsample_mmx
%include "i386-mmx/jdmrgext.asm"
%include "jdmrgext-mmx.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -123,4 +123,4 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_mmx jsimd_h2v1_extxrgb_merged_upsample_mmx
%define jsimd_h2v2_merged_upsample_mmx jsimd_h2v2_extxrgb_merged_upsample_mmx
%include "i386-mmx/jdmrgext.asm"
%include "jdmrgext-mmx.asm"

View File

@@ -51,7 +51,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
SECTION SEG_TEXT
BITS 64
%include "x86_64-sse2/jdmrgext.asm"
%include "jdmrgext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -63,7 +63,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgb_merged_upsample_sse2
%include "x86_64-sse2/jdmrgext.asm"
%include "jdmrgext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -75,7 +75,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgbx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgbx_merged_upsample_sse2
%include "x86_64-sse2/jdmrgext.asm"
%include "jdmrgext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -87,7 +87,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgr_merged_upsample_sse2
%include "x86_64-sse2/jdmrgext.asm"
%include "jdmrgext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -99,7 +99,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgrx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgrx_merged_upsample_sse2
%include "x86_64-sse2/jdmrgext.asm"
%include "jdmrgext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -111,7 +111,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxbgr_merged_upsample_sse2
%include "x86_64-sse2/jdmrgext.asm"
%include "jdmrgext-sse2-64.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -123,4 +123,4 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxrgb_merged_upsample_sse2
%include "x86_64-sse2/jdmrgext.asm"
%include "jdmrgext-sse2-64.asm"

View File

@@ -51,7 +51,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
SECTION SEG_TEXT
BITS 32
%include "i386-sse2/jdmrgext.asm"
%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -63,7 +63,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgb_merged_upsample_sse2
%include "i386-sse2/jdmrgext.asm"
%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -75,7 +75,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgbx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgbx_merged_upsample_sse2
%include "i386-sse2/jdmrgext.asm"
%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -87,7 +87,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgr_merged_upsample_sse2
%include "i386-sse2/jdmrgext.asm"
%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -99,7 +99,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgrx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgrx_merged_upsample_sse2
%include "i386-sse2/jdmrgext.asm"
%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -111,7 +111,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxbgr_merged_upsample_sse2
%include "i386-sse2/jdmrgext.asm"
%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -123,4 +123,4 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxrgb_merged_upsample_sse2
%include "i386-sse2/jdmrgext.asm"
%include "jdmrgext-sse2.asm"