Commit 2f351412 authored by Adrian Knoth's avatar Adrian Knoth
Browse files

[wscript] Use CFLAGS, not CCFLAGS

CCFLAGS isn't honoured at all, the proper name is CFLAGS.
parent e577581d
......@@ -136,14 +136,14 @@ def build(bld):
prog = bld(features = 'c cprogram')
prog.includes = os_incdir + ['../common/jack', '../common']
prog.source = ['alsa_in.c', '../common/memops.c']
prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR")
prog.env.append_value("CFLAGS", "-DNO_JACK_ERROR")
prog.use = ['clientlib', 'ALSA', 'SAMPLERATE']
prog.target = 'alsa_in'
prog = bld(features = 'c cprogram')
prog.includes = os_incdir + ['../common/jack', '../common']
prog.source = ['alsa_out.c', '../common/memops.c']
prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR")
prog.env.append_value("CFLAGS", "-DNO_JACK_ERROR")
prog.use = ['clientlib', 'ALSA', 'SAMPLERATE']
prog.target = 'alsa_out'
......
......@@ -6,7 +6,7 @@ def create_jack_driver_obj(bld, target, sources, uselib = None):
driver.features.append('cc')
driver.env['shlib_PATTERN'] = 'jack_%s.so'
#driver.env.append_unique('CXXFLAGS', '-march=i686 -msse3 -ffast-math')
#driver.env.append_unique('CCFLAGS', '-march=i686 -msse3 -ffast-math')
#driver.env.append_unique('CFLAGS', '-march=i686 -msse3 -ffast-math')
driver.defines = 'HAVE_CONFIG_H'
driver.includes = ['.', '..','../posix', '../common', '../common/jack']
driver.target = target
......
......@@ -116,7 +116,7 @@ def configure(conf):
# conf.check_tool('compiler_cc')
conf.env.append_unique('CXXFLAGS', '-Wall')
conf.env.append_unique('CCFLAGS', '-Wall')
conf.env.append_unique('CFLAGS', '-Wall')
conf.sub_config('common')
if conf.env['IS_LINUX']:
......@@ -211,7 +211,7 @@ def configure(conf):
if conf.env['BUILD_DEBUG']:
conf.env.append_unique('CXXFLAGS', '-g')
conf.env.append_unique('CCFLAGS', '-g')
conf.env.append_unique('CFLAGS', '-g')
conf.env.append_unique('LINKFLAGS', '-g')
conf.define('CLIENT_NUM', Options.options.clients)
......@@ -243,7 +243,7 @@ def configure(conf):
env_variant2.set_variant('lib32')
conf.setenv('lib32')
conf.env.append_unique('CXXFLAGS', '-m32')
conf.env.append_unique('CCFLAGS', '-m32')
conf.env.append_unique('CFLAGS', '-m32')
conf.env.append_unique('LINKFLAGS', '-m32')
if Options.options.libdir32:
conf.env['LIBDIR'] = Options.options.libdir32
......@@ -267,7 +267,7 @@ def configure(conf):
display_msg("Library directory", conf.env['LIBDIR'], 'CYAN')
display_msg("Drivers directory", conf.env['ADDON_DIR'], 'CYAN')
display_feature('Build debuggable binaries', conf.env['BUILD_DEBUG'])
display_msg('C compiler flags', repr(conf.env['CCFLAGS']))
display_msg('C compiler flags', repr(conf.env['CFLAGS']))
display_msg('C++ compiler flags', repr(conf.env['CXXFLAGS']))
display_msg('Linker flags', repr(conf.env['LINKFLAGS']))
display_feature('Build doxygen documentation', conf.env['BUILD_DOXYGEN_DOCS'])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment