summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Woelders <kim@woelders.dk>2009-08-10 16:26:20 +0000
committerKim Woelders <kim@woelders.dk>2009-08-10 16:26:20 +0000
commitdd93bae9384df511b2ea6fa7c593a82a772392b2 (patch)
treed63da8a904d6afb557821d5c36e3c6cff83455e9
parent661a78dc572a600e16555ce5431c795d7d02ef49 (diff)
downloadimlib2-dd93bae9384df511b2ea6fa7c593a82a772392b2.tar.gz
Fix build for x86 on x86_64.
As far as I can tell this fixes building on x86_64 with e.g. './configure --enable-mmx CFLAGS=-m32" or "rpmbuild --target i386 ..." without breaking anything. SVN revision: 41667
-rw-r--r--imlib2.spec.in3
-rw-r--r--src/lib/Makefile.am5
2 files changed, 3 insertions, 5 deletions
diff --git a/imlib2.spec.in b/imlib2.spec.in
index ee08815..8dd606f 100644
--- a/imlib2.spec.in
+++ b/imlib2.spec.in
@@ -129,6 +129,9 @@ id3 tag image loader/saver for Imlib2
%ifarch x86_64
--disable-mmx \
%endif
+%ifarch i386 i486 i586 i686
+ --enable-mmx \
+%endif
$RPM_CONFIGURE_OPTS
%{__make} %{?_smp_mflags} %{?mflags}
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e179519..81d3bf2 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -63,11 +63,6 @@ updates.h \
ximage.c \
ximage.h
-AS = $(CC)
-CCAS = $(CC)
-ASFLAGS = -I$(top_srcdir) -I$(top_builddir)
-CCASFLAGS = -I$(top_srcdir) -I$(top_builddir)
-
MMX_SRCS = \
asm_blend.S \
asm_blend_cmod.S \