Fiddle with CCFLAGS and CXXFLAGS.

git-svn-id: svn://localhost/ardour2/branches/3.0@4678 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/autowaf.py b/autowaf.py
index 8dc9efffc3693c53a71c8023163160f6bf5998e1..e68491cacf1e2c59d6d1f5ed78a0a77a33b35cb2 100644 (file)
--- a/autowaf.py
+++ b/autowaf.py
@@ -200,12 +200,14 @@ def configure(conf):
        conf.env['LV2DIRNAME'] = chop_prefix(conf, 'LV2DIR')
        
        if Options.options.debug:
-               conf.env['CCFLAGS'] = '-O0 -g -std=c99'
-               conf.env['CXXFLAGS'] = '-O0 -g -ansi'
+               conf.env['CCFLAGS'] = '-O0 -g'
+               conf.env['CXXFLAGS'] = '-O0 -g'
+       else:
+               append_cxx_flags('-DNDEBUG')
        if Options.options.strict:
-               conf.env['CCFLAGS'] = '-O0 -g -std=c99 -pedantic'
+               conf.env.append_value('CCFLAGS', '-std=c99 -pedantic')
+               conf.env.append_value('CXXFLAGS', '-ansi -Woverloaded-virtual')
                append_cxx_flags('-Wall -Wextra -Wno-unused-parameter')
-               conf.env.append_value('CXXFLAGS', '-Woverloaded-virtual')
        append_cxx_flags('-fPIC -DPIC')
        g_step = 2