diff options
author | David Schleef <ds@schleef.org> | 2005-11-07 07:38:39 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2005-11-07 07:38:39 +0000 |
commit | fbe8bafab204d41fefd0c7481f98c9a148007eb8 (patch) | |
tree | 6b9e2a85e6a4e5901b60428e0d0bac102aa3c265 | |
parent | 71da811a8a5c8fcb46e02ce55de1d7ffd55352f8 (diff) | |
download | liboil-fbe8bafab204d41fefd0c7481f98c9a148007eb8.tar.gz |
* liboil/Makefile.am: Fix more stuff and reenable MMX
* liboil/conv/Makefile.am:
* liboil/conv/conv_3dnow.c: move
* liboil/conv/conv_sse.c: move
* liboil/fb/Makefile.am:
* liboil/i386/Makefile.am:
* liboil/i386/conv_3dnow.c: move
* liboil/i386/conv_sse.c: move
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | liboil/Makefile.am | 12 | ||||
-rw-r--r-- | liboil/conv/Makefile.am | 16 | ||||
-rw-r--r-- | liboil/fb/Makefile.am | 30 | ||||
-rw-r--r-- | liboil/i386/Makefile.am | 23 | ||||
-rw-r--r-- | liboil/i386/conv_3dnow.c (renamed from liboil/conv/conv_3dnow.c) | 2 | ||||
-rw-r--r-- | liboil/i386/conv_sse.c (renamed from liboil/conv/conv_sse.c) | 3 |
7 files changed, 28 insertions, 69 deletions
@@ -1,3 +1,14 @@ +2005-11-06 David Schleef <ds@schleef.org> + + * liboil/Makefile.am: Fix more stuff and reenable MMX + * liboil/conv/Makefile.am: + * liboil/conv/conv_3dnow.c: move + * liboil/conv/conv_sse.c: move + * liboil/fb/Makefile.am: + * liboil/i386/Makefile.am: + * liboil/i386/conv_3dnow.c: move + * liboil/i386/conv_sse.c: move + 2005-11-04 David Schleef <ds@schleef.org> * configure.ac: version bump diff --git a/liboil/Makefile.am b/liboil/Makefile.am index f2038e0..684c731 100644 --- a/liboil/Makefile.am +++ b/liboil/Makefile.am @@ -4,9 +4,13 @@ pkgincludedir = $(includedir)/liboil-@LIBOIL_MAJORMINOR@/liboil if HAVE_GCC_I386 subdir_i386 = i386 libs_i386 = i386/libi386.la +if HAVE_MMX_INTRINSICS +subdir_i386 += fb +libs_i386 += fb/libfb.la +endif if HAVE_SSE_INTRINSICS -subdir_i386 += fb sse -libs_i386 += fb/libfb.la sse/libsse.la +subdir_i386 += sse +libs_i386 += sse/libsse.la endif else subdir_i386 = @@ -60,11 +64,11 @@ liboilfunctions_la_LIBADD = \ colorspace/libcolorspace.la \ copy/libcopy.la \ dct/libdct.la \ - $(i386_libs) \ + $(libs_i386) \ jpeg/libjpeg.la \ math/libmath.la \ md5/libmd5.la \ - $(powerpc_libs) \ + $(libs_powerpc) \ ref/libref.la \ simdpack/libsimdpack.la \ utf8/libutf8.la diff --git a/liboil/conv/Makefile.am b/liboil/conv/Makefile.am index 5332c6e..2a80a27 100644 --- a/liboil/conv/Makefile.am +++ b/liboil/conv/Makefile.am @@ -11,27 +11,13 @@ c_sources = \ conv_bitstuff.c \ conv_misc.c -if HAVE_GCC_I386 -i386_sources = conv_sse.c conv_3dnow.c -else -i386_sources = -endif - -if HAVE_GCC_AMD64 -amd64_sources = conv_sse.c conv_3dnow.c -else -amd64_sources = -endif - libconv_opt_la_SOURCES = $(c_sources) libconv_opt_la_CFLAGS = $(LIBOIL_CFLAGS) $(LIBOIL_OPT_CFLAGS) noinst_HEADERS = conv.h libconv_la_SOURCES = \ - $(c_sources) \ - $(i386_sources) \ - $(amd64_sources) + $(c_sources) libconv_la_CFLAGS = $(LIBOIL_CFLAGS) libconv_la_LIBADD = $(opt_libs) diff --git a/liboil/fb/Makefile.am b/liboil/fb/Makefile.am index e023635..ae50ce2 100644 --- a/liboil/fb/Makefile.am +++ b/liboil/fb/Makefile.am @@ -1,36 +1,10 @@ -CLEANFILES = empty.c - -if USE_ALT_OPT -opt_libs = libfb_opt.la -else -opt_libs = -endif -noinst_LTLIBRARIES = libfb.la $(opt_libs) - -if HAVE_GCC_I386 -c_sources = \ - fbmmx.c -else -if HAVE_GCC_AMD64 -c_sources = \ - fbmmx.c -else -c_sources = \ - empty.c -endif -endif +noinst_LTLIBRARIES = libfb.la noinst_HEADERS = \ fbmmx.h \ fbpict.h -libfb_la_SOURCES = $(c_sources) +libfb_la_SOURCES = fbmmx.c libfb_la_CFLAGS = $(MMX_CFLAGS) $(SSE_CFLAGS) $(LIBOIL_CFLAGS) -libfb_opt_la_SOURCES = $(c_sources) -libfb_opt_la_CFLAGS = $(LIBOIL_CFLAGS) $(LIBOIL_OPT_CFLAGS) $(MMX_CFLAGS) $(SSE_CFLAGS) - -empty.c: - echo >empty.c - diff --git a/liboil/i386/Makefile.am b/liboil/i386/Makefile.am index 4325610..c16c781 100644 --- a/liboil/i386/Makefile.am +++ b/liboil/i386/Makefile.am @@ -1,13 +1,13 @@ -CLEANFILES = empty.c - noinst_LTLIBRARIES = libi386.la -sources = \ +libi386_la_SOURCES = \ abs_i386.c \ argb_paint_i386.c \ ayuv2argb_i386.c \ composite_i386.c \ + conv_sse.c \ + conv_3dnow.c \ copy8x8_i386.c \ copy_i386.c \ diff8x8_i386.c \ @@ -24,22 +24,5 @@ sources = \ splat_i386.c \ trans8x8_i386.c -if HAVE_GCC_I386 -i386_sources = $(sources) -else -i386_sources = empty.c -endif - -if HAVE_GCC_AMD64 -amd64_sources = $(sources) -else -amd64_sources = empty.c -endif - -libi386_la_SOURCES = \ - $(i386_sources) libi386_la_CFLAGS = $(LIBOIL_CFLAGS) -empty.c: - echo >empty.c - diff --git a/liboil/conv/conv_3dnow.c b/liboil/i386/conv_3dnow.c index 4c6024e..d744bac 100644 --- a/liboil/conv/conv_3dnow.c +++ b/liboil/i386/conv_3dnow.c @@ -29,7 +29,7 @@ #include "config.h" #endif #include <liboil/liboilfunction.h> -#include <conv.h> +#include <liboil/liboilclasses.h> /* suboptimal */ diff --git a/liboil/conv/conv_sse.c b/liboil/i386/conv_sse.c index e1b8723..03ed689 100644 --- a/liboil/conv/conv_sse.c +++ b/liboil/i386/conv_sse.c @@ -29,8 +29,9 @@ #include "config.h" #endif #include <liboil/liboilfunction.h> -#include <conv.h> +OIL_DECLARE_CLASS(conv_f64_s32); +OIL_DECLARE_CLASS(conv_s32_f64); /* suboptimal */ static void conv_f64_s32_sse(double *dst, int dst_stride, int32_t *src, int src_stride, int n) |