ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SIMD build compulsory (otherwise, what's the point?)

Browse Source
This commit is contained in:
DRC
2010-02-11 06:57:57 +00:00
parent 2e069ba879
commit 4c1c7f5a52
2 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@@ -16,19 +16,10 @@ libjpeg_la_SOURCES = $(HDRS) jcapimin.c jcapistd.c jccoefct.c jccolor.c \
libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h
if WITH_SIMD
SUBDIRS = simd SUBDIRS = simd
libjpeg_la_LIBADD = simd/libsimd.la libjpeg_la_LIBADD = simd/libsimd.la
libturbojpeg_la_LIBADD = simd/libsimd.la libturbojpeg_la_LIBADD = simd/libsimd.la
else
libjpeg_la_SOURCES += jsimd_none.c
libturbojpeg_la_SOURCES += jsimd_none.c
endif
TSTHDRS = rrutil.h rrtimer.h TSTHDRS = rrutil.h rrtimer.h
noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg

46
configure.ac
View File

@@ -82,35 +82,25 @@ case "$host_os" in
esac esac
AM_CONDITIONAL([IS_WIN32], [test "x$is_win32" = "x1"]) AM_CONDITIONAL([IS_WIN32], [test "x$is_win32" = "x1"])
# SIMD is optional # Check if we're on a supported CPU
AC_ARG_WITH([simd], AC_MSG_CHECKING([if we have SIMD optimisations for cpu type])
AC_HELP_STRING([--without-simd],[Omit accelerated SIMD routines.])) case "$host_cpu" in
if test "x${with_simd}" != "xno"; then x86_64)
# Check if we're on a supported CPU AC_MSG_RESULT([yes (x86_64)])
AC_MSG_CHECKING([if we have SIMD optimisations for cpu type]) AC_PROG_NASM
case "$host_cpu" in simd_arch=x86_64
x86_64) ;;
AC_MSG_RESULT([yes (x86_64)]) i*86 | x86 | ia32)
AC_PROG_NASM AC_MSG_RESULT([yes (i386)])
simd_arch=x86_64 AC_PROG_NASM
;; simd_arch=i386
i*86 | x86 | ia32) ;;
AC_MSG_RESULT([yes (i386)]) *)
AC_PROG_NASM AC_MSG_RESULT([no ("$host_cpu")])
simd_arch=i386 AC_MSG_ERROR([CPU is not supported])
;; ;;
*) esac
AC_MSG_RESULT([no ("$host_cpu")])
with_simd=no
;;
esac
if test "x${with_simd}" != "xno"; then
AC_DEFINE([WITH_SIMD], [1], [Use accelerated SIMD routines.])
fi
fi
AM_CONDITIONAL([WITH_SIMD], [test "x$with_simd" != "xno"])
AM_CONDITIONAL([SIMD_I386], [test "x$simd_arch" = "xi386"]) AM_CONDITIONAL([SIMD_I386], [test "x$simd_arch" = "xi386"])
AM_CONDITIONAL([SIMD_X86_64], [test "x$simd_arch" = "xx86_64"]) AM_CONDITIONAL([SIMD_X86_64], [test "x$simd_arch" = "xx86_64"])