From 77fab80d08b4a3df432bda077575a5ac33029acc Mon Sep 17 00:00:00 2001 From: oparviai Date: Sun, 17 Feb 2008 15:16:17 +0000 Subject: [PATCH] Edited automake scripts --- configure.ac | 3 +-- source/SoundTouch/Makefile.am | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 9d1480a..45bdde3 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple dnl Place - Suite 330, Boston, MA 02111-1307, USA # Process this file with autoconf to produce a configure script. -AC_INIT(SoundTouch, 1.3.1, [http://www.surina.net/soundtouch]) +AC_INIT(SoundTouch, 1.3.2, [http://www.surina.net/soundtouch]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER([include/soundtouch_config.h]) AM_INIT_AUTOMAKE @@ -88,7 +88,6 @@ fi - dnl ############################################################################ dnl # Checks for library functions/classes # dnl ############################################################################ diff --git a/source/SoundTouch/Makefile.am b/source/SoundTouch/Makefile.am index bfb73d6..88190ba 100644 --- a/source/SoundTouch/Makefile.am +++ b/source/SoundTouch/Makefile.am @@ -29,19 +29,18 @@ EXTRA_DIST=3dnow_win.cpp cpu_detect_x86_win.cpp SoundTouch.dsp SoundTouch.dsw So noinst_HEADERS=AAFilter.h cpu_detect.h cpu_detect_x86_gcc.cpp FIRFilter.h RateTransposer.h TDStretch.h lib_LTLIBRARIES=libSoundTouch.la -# the mmx_gcc.cpp and cpu_detect_x86_gcc.cpp may need to be conditionally included here from things discovered in configure.ac -# libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp mmx_optimized.cpp sse_optimized.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp -libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp +# +libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp mmx_optimized.cpp sse_optimized.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp -# ??? test for -fcheck-new in configure.ac -# other compiler flags to add -# AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include -AM_CXXFLAGS=-O3 -fcheck-new -I../../include +# Note by authore: '-msse2' might not work in non-X86 compilations. If someone can +# fix this script to automatically check for CPU architecture, please submit a patch +# to me. +AM_CXXFLAGS=-O3 -msse2 -fcheck-new -I../../include + # other linking flags to add -noinst_LTLIBRARIES = libSoundTouchOpt.la -libSoundTouch_la_LIBADD = libSoundTouchOpt.la -libSoundTouchOpt_la_SOURCES = mmx_optimized.cpp sse_optimized.cpp -libSoundTouchOpt_la_CXXFLAGS = -O3 -msse2 -fcheck-new -I../../include - +# noinst_LTLIBRARIES = libSoundTouchOpt.la +# libSoundTouch_la_LIBADD = libSoundTouchOpt.la +# libSoundTouchOpt_la_SOURCES = mmx_optimized.cpp sse_optimized.cpp +# libSoundTouchOpt_la_CXXFLAGS = -O3 -msse2 -fcheck-new -I../../include