Mercurial > hg > tony

comparison configure.ac @ 521:25aa28a27252

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update SV code following SV 3.0.x release series
author Chris Cannam
date Wed, 15 Mar 2017 11:31:49 +0000
parents 7665cc683dd1
children 9fc762aafd01
comparison
equal deleted inserted replaced
520:30fbc53d8150 521:25aa28a27252
38 PKG_PROG_PKG_CONFIG 38 PKG_PROG_PKG_CONFIG
39 39
40 SV_CHECK_QT 40 SV_CHECK_QT
41 41
42 SV_DEFINES_DEBUG="-DDEBUG -DBUILD_DEBUG -DWANT_TIMING" 42 SV_DEFINES_DEBUG="-DDEBUG -DBUILD_DEBUG -DWANT_TIMING"
43 SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING" 43 SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING -DNO_HIT_COUNTS"
44 SV_DEFINES_MINIMAL="$SV_DEFINES_RELEASE" 44 SV_DEFINES_MINIMAL="$SV_DEFINES_RELEASE"
45 45
46 # Now we have: USER_CXXFLAGS contains any flags the user set 46 # Now we have: USER_CXXFLAGS contains any flags the user set
47 # explicitly; AUTOCONF_CXXFLAGS contains flags that Autoconf thought 47 # explicitly; AUTOCONF_CXXFLAGS contains flags that Autoconf thought
48 # we should use. If we have GCC, we override the latter but then 48 # we should use. If we have GCC, we override the latter but then
53 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS" 53 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
54 54
55 if test "x$GCC" = "xyes"; then 55 if test "x$GCC" = "xyes"; then
56 CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe" 56 CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
57 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -Werror -g" 57 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -Werror -g"
58 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2" 58 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
59 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0" 59 CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
60 fi 60 fi
61 61
62 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE" 62 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
63 SV_DEFINES_BUILD="$SV_DEFINES_RELEASE" 63 SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"
81 SV_MODULE_REQUIRED([bz2],[],[bzlib.h],[bz2],[BZ2_bzReadOpen]) 81 SV_MODULE_REQUIRED([bz2],[],[bzlib.h],[bz2],[BZ2_bzReadOpen])
82 SV_MODULE_REQUIRED([fftw3],[fftw3 >= 3.0.0],[fftw3.h],[fftw3],[fftw_execute]) 82 SV_MODULE_REQUIRED([fftw3],[fftw3 >= 3.0.0],[fftw3.h],[fftw3],[fftw_execute])
83 SV_MODULE_REQUIRED([fftw3f],[fftw3f >= 3.0.0],[fftw3.h],[fftw3f],[fftwf_execute]) 83 SV_MODULE_REQUIRED([fftw3f],[fftw3f >= 3.0.0],[fftw3.h],[fftw3f],[fftwf_execute])
84 SV_MODULE_REQUIRED([sndfile],[sndfile >= 1.0.16],[sndfile.h],[sndfile],[sf_open]) 84 SV_MODULE_REQUIRED([sndfile],[sndfile >= 1.0.16],[sndfile.h],[sndfile],[sf_open])
85 SV_MODULE_REQUIRED([libsamplerate],[samplerate >= 0.1.2],[samplerate.h],[samplerate],[src_new]) 85 SV_MODULE_REQUIRED([libsamplerate],[samplerate >= 0.1.2],[samplerate.h],[samplerate],[src_new])
86 SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
87 SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.5],[vamp-hostsdk/PluginLoader.h],[vamp-hostsdk],[libvamphostsdk_v_2_5_present])
88 SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new]) 86 SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
89 SV_MODULE_REQUIRED([sord],[sord-0 >= 0.5],[sord/sord.h],[sord-0],[sord_world_new]) 87 SV_MODULE_REQUIRED([sord],[sord-0 >= 0.5],[sord/sord.h],[sord-0],[sord_world_new])
90 SV_MODULE_REQUIRED([serd],[serd-0 >= 0.5],[serd/serd.h],[serd-0],[serd_reader_read_file]) 88 SV_MODULE_REQUIRED([serd],[serd-0 >= 0.5],[serd/serd.h],[serd-0],[serd_reader_read_file])
91 89
92 SV_MODULE_OPTIONAL([liblo],[],[lo/lo.h],[lo],[lo_address_new]) 90 SV_MODULE_OPTIONAL([liblo],[],[lo/lo.h],[lo],[lo_address_new])
118 AC_SUBST(CC) 116 AC_SUBST(CC)
119 AC_SUBST(CXX) 117 AC_SUBST(CXX)
120 118
121 AC_SUBST(QMAKE_CONFIG) 119 AC_SUBST(QMAKE_CONFIG)
122 120
123 AC_CONFIG_SUBDIRS([svcore svgui svapp])
124 AC_CONFIG_FILES([config.pri]) 121 AC_CONFIG_FILES([config.pri])
125 122
126 AC_OUTPUT 123 AC_OUTPUT
127 124
128 if ! $QMAKE -r tony.pro; then 125 if ! $QMAKE -r tony.pro; then