Commit fc385a86 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

use AM_PROG_AS instead of defining CCAS and CCASFLAGS manually. Changed

2003-07-14  Sven Neumann  <sven@gimp.org>

	* configure.in: use AM_PROG_AS instead of defining CCAS and
	CCASFLAGS manually. Changed the assembler checks to use inline
	assembly as we do in app/composite/gimp-composite-mmx.c.

	* app/composite/Makefile.am: build the MMX code again; we need it
	to be tested. If you have any problems, please report them. You can
	quick-fix your build using the --disable-mmx configure option.

	* app/paint-funcs/Makefile.am: reverted Helvetix' change ...
	* app/paint-funcs/paint-funcs.c: ... and include
	"composite/gimp-composite.h" instead of "gimp-composite.h".
parent b4ee5378
2003-07-14 Sven Neumann <sven@gimp.org>
* configure.in: use AM_PROG_AS instead of defining CCAS and
CCASFLAGS manually. Changed the assembler checks to use inline
assembly as we do in app/composite/gimp-composite-mmx.c.
* app/composite/Makefile.am: build the MMX code again; we need it
to be tested. If you have any problems, please report them. You can
quick-fix your build using the --disable-mmx configure option.
* app/paint-funcs/Makefile.am: reverted Helvetix' change ...
* app/paint-funcs/paint-funcs.c: ... and include
"composite/gimp-composite.h" instead of "gimp-composite.h".
2003-07-14 Sven Neumann <sven@gimp.org>
* app/base/base.c (base_init): include composite/gimp-composite.h.
......@@ -7,7 +21,7 @@
2003-07-13 Helvetix Victorinox <helvetix@gimp.org>
* app/composite/gimp-composite-dispatch.[ch] are in CVS although
* app/composite/gimp-composite-dispatch.[ch]: are in CVS although
they are generated files. This is preparation for building the
table at run-time, instead of compile time.
......@@ -19,29 +33,29 @@
2003-07-13 Helvetix Victorinox <helvetix@gimp.org>
* app/composite/Makefile.am fixed typo with trailing backslash.
* app/composite/Makefile.am: fixed typo with trailing backslash.
* app/paint-funcs/Makefile.am include files from app/composite/
* app/paint-funcs/Makefile.am: include files from app/composite/
* app/paint-funcs/paint-funcs.c stubbed out code for using
* app/paint-funcs/paint-funcs.c: stubbed out code for using
gimp_composite. To enable the use of gimp_composite, set the
value of gimp_composite_use_old to 0 (zero).
* app/base/base.c calls gimp_composite_init() hook to initialse
* app/base/base.c: calls gimp_composite_init() hook to initialse
all the gimp_composite "stuff."
* app/composite/make-gimp-composite-dispatch.py now generates
* app/composite/make-gimp-composite-dispatch.py: now generates
gimp-composite-dispatch.h
* app/composite/gimp-composite-dispatch.[ch] are in CVS although
* app/composite/gimp-composite-dispatch.[ch]: are in CVS although
they are generated files. This is preparation for building the
table at run-time, instead of compile time.
* app/composite/gimp-composite.c doesn't #include the main
* app/composite/gimp-composite.c: doesn't #include the main
dispatch table. This is preparation for building the table at
run-time, instead of compile time.
* app/composite/Makefile.am doesn't compile gimp-composite-mmx.c
* app/composite/Makefile.am: doesn't compile gimp-composite-mmx.c
(until the various remaining gcc problems and configuration issues
are worked out).
......@@ -18,16 +18,14 @@ INCLUDES = \
noinst_LIBRARIES = libappcomposite.a
libappcomposite_mmx_sources = \
gimp-composite-mmx.c \
gimp-composite-mmx.h
libappcomposite_a_sources = \
gimp-composite.c \
gimp-composite-generic.c \
gimp-composite-generic.h \
gimp-composite.h \
gimp-composite-dispatch.c \
gimp-composite-generic.c \
gimp-composite-generic.h \
gimp-composite-mmx.c \
gimp-composite-mmx.h \
gimp-composite-util.h
libappcomposite_a_built_sources = gimp-composite-dispatch.c
......
......@@ -11,7 +11,6 @@ libapppaint_funcs_a_SOURCES = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
-I$(top_srcdir)/app/composite \
$(GLIB_CFLAGS) \
-I$(includedir)
......
......@@ -34,9 +34,10 @@
#include "base/tile-manager.h"
#include "base/tile.h"
#include "composite/gimp-composite.h"
#include "paint-funcs.h"
#include "paint-funcs-generic.h"
#include "gimp-composite.h"
#define RANDOM_SEED 314159265
#define EPSILON 0.0001
......
......@@ -75,12 +75,6 @@ AM_MAINTAINER_MODE
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
dnl XXXX Hack: Set CCAS and CCASFLAGS so that automake 1.6 will be happy
CCAS="\${CC}"
CCASFLAGS="\${CFLAGS}"
AC_SUBST(CCAS)
AC_SUBST(CCASFLAGS)
####################
# Initialize libtool
......@@ -163,6 +157,7 @@ AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
dnl Checks for programs.
AC_ISC_POSIX
AM_PROG_CC_STDC
AM_PROG_AS
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
......@@ -423,14 +418,10 @@ AC_ARG_ENABLE(sse,
if test "x$enable_mmx" = xyes; then
dnl Necessary for assembler sources
save_ac_ext="$ac_ext"
ac_ext=S
AC_MSG_CHECKING(whether we can compile MMX code)
echo " movq 0, %mm0" > conftest.S
if AC_TRY_EVAL(ac_compile); then
AC_COMPILE_IFELSE([asm ("movq 0, %mm0");],
AC_DEFINE(USE_MMX, 1, [Define to 1 if MMX assembly is available.])
AC_MSG_RESULT(yes)
......@@ -438,26 +429,21 @@ if test "x$enable_mmx" = xyes; then
AC_MSG_CHECKING(whether we can compile SSE code)
echo " movntps %xmm0, 0" > conftest.S
if AC_TRY_EVAL(ac_compile); then
AC_COMPILE_IFELSE([asm ("movntps %xmm0, 0");],
AC_DEFINE(USE_SSE, 1, [Define to 1 if SSE assembly is available.])
AC_MSG_RESULT(yes)
else
,
enable_sse=no
AC_MSG_RESULT(no)
AC_MSG_WARN([The assembler does not support the SSE command set.])
fi
)
fi
else
,
enable_mmx=no
AC_MSG_RESULT(no)
AC_MSG_WARN([The assembler does not support the MMX command set.])
fi
rm conftest*
ac_ext="$save_ac_ext"
)
fi
......@@ -472,24 +458,16 @@ AC_ARG_ENABLE(altivec,
if test "x$enable_altivec" = xyes; then
dnl Necessary for assembler sources
save_ac_ext="$ac_ext"
ac_ext=S
AC_MSG_CHECKING(whether we can compile Altivec code)
echo " vand %v0, %v0, %v0" > conftest.S
if AC_TRY_EVAL(ac_compile); then
AC_COMPILE_IFELSE([asm ("vand %v0, %v0, %v0");],
AC_DEFINE(USE_ALTIVEC, 1, [Define to 1 if Altivec assembly is available.])
AC_MSG_RESULT(yes)
else
,
enable_altivec=no
AC_MSG_RESULT(no)
AC_MSG_WARN([The assembler does not support the Altivec command set.])
fi
rm conftest*
ac_ext="$save_ac_ext"
)
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment