Revision 110:125520c3dc05 configure.ac

View differences:

configure.ac
40 40
SV_CHECK_QT
41 41

  
42 42
SV_DEFINES_DEBUG="-DDEBUG -DBUILD_DEBUG -DWANT_TIMING"
43
SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING"
44
SV_DEFINES_MINIMAL="$SV_DEFINES_RELEASE"
43
SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING -DNO_HIT_COUNTS"
45 44

  
46 45
# Now we have: USER_CXXFLAGS contains any flags the user set
47 46
# explicitly; AUTOCONF_CXXFLAGS contains flags that Autoconf thought
......
49 48
# allow ourselves to be overridden (later) by the former
50 49

  
51 50
CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS"
51
OPTFLAGS_DEBUG="-O2"
52
LDFLAGS_DEBUG=""
52 53
CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
53
CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
54
OPTFLAGS_RELEASE="-O2"
55
LDFLAGS_RELEASE=""
56
CXXSTANDARD=c++14
54 57

  
55 58
if test "x$GCC" = "xyes"; then
56
   	CXXFLAGS_ANY="-std=c++11 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
59
   	CXXFLAGS_ANY="-fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
57 60
        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
58
   	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
59
   	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
61
        OPTFLAGS_DEBUG="-O2"
62
   	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0"
63
        OPTFLAGS_RELEASE="-O3 -ffast-math"
64
        LIBS_DEBUG="$LIBS"
65
        AX_CHECK_COMPILE_FLAG(--std=$CXXSTANDARD, [], [AC_MSG_NOTICE([Compiler does not appear to support $CXXSTANDARD, falling back to c++11])
66
        CXXSTANDARD=c++11])
60 67
fi
61 68

  
62
CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
69
CXXFLAGS_BUILD="$CXXFLAGS_RELEASE $OPTFLAGS_RELEASE"
70
LDFLAGS_BUILD="$LDFLAGS_RELEASE $OPTFLAGS_RELEASE"
63 71
SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"
64 72

  
65 73
QMAKE_CONFIG="release"
66 74

  
67 75
AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[enable debug support [default=no]])],[AC_MSG_NOTICE([enabling debug build])
68 76
QMAKE_CONFIG="debug"
69
CXXFLAGS_BUILD="$CXXFLAGS_DEBUG"
70
SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"])
77
CXXFLAGS_BUILD="$CXXFLAGS_DEBUG $OPTFLAGS_DEBUG"
78
LDFLAGS_BUILD="$LDFLAGS_DEBUG"
79
SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"
80
LIBS="$LIBS_DEBUG"])
71 81

  
72 82
if test x"$USER_CXXFLAGS" != x; then
73 83
   	AC_MSG_NOTICE([The CXXFLAGS environment variable is set to "$USER_CXXFLAGS".])
74 84
	AC_MSG_NOTICE(Overriding default compiler flags with the above user setting.)
75 85
	CXXFLAGS_BUILD="$USER_CXXFLAGS"
76
	CXXFLAGS_MINIMAL="$USER_CXXFLAGS"
86
        LDFLAGS_BUILD=""
77 87
fi
78 88

  
79 89
CXXFLAGS="$CXXFLAGS_BUILD $SV_DEFINES_BUILD"
90
LDFLAGS="$LDFLAGS_BUILD"
80 91

  
81 92
SV_MODULE_REQUIRED([bz2],[],[bzlib.h],[bz2],[BZ2_bzReadOpen])
82 93
SV_MODULE_REQUIRED([fftw3],[fftw3 >= 3.0.0],[fftw3.h],[fftw3],[fftw_execute])
......
113 124
SV_MODULE_OPTIONAL([fishsound],[fishsound >= 1.0.0],[fishsound/fishsound.h],[fishsound],[fish_sound_new])
114 125
SV_MODULE_OPTIONAL([mad],[mad >= 0.15.0],[mad.h],[mad],[mad_decoder_init])
115 126
SV_MODULE_OPTIONAL([id3tag],[id3tag >= 0.15.0],[id3tag.h],[id3tag],[id3_tag_new])
127
SV_MODULE_OPTIONAL([opus],[opusfile],[opus/opusfile.h],[opusfile],[op_read_float])
116 128

  
117 129
# Link in -lX11 if it exists -- this is for the X error handler
118 130
SV_MODULE_OPTIONAL([X11],[x11 >= 1.0.0],[X11/X.h],[x11],[XGetErrorText])
......
125 137

  
126 138
AC_SUBST(CFLAGS)
127 139
AC_SUBST(CXXFLAGS)
128
AC_SUBST(CXXFLAGS_MINIMAL)
140
AC_SUBST(CXXSTANDARD)
129 141
AC_SUBST(LDFLAGS)
130 142
AC_SUBST(HAVES)
131 143
AC_SUBST(LIBS)

Also available in: Unified diff