diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-17 22:25:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-17 22:25:32 +0000 |
| commit | b89a786b3e300ce3eb28c4e6791e8e141afb19f9 (patch) | |
| tree | 403d58a1440884a45135dcdc252229b592270cd3 | |
| parent | 7884727e78f9e2253b2b6d8ef441fa07272fe950 (diff) | |
hopefully fix the build, and actually use the options
git-svn-id: svn://localhost/ardour2/branches/3.0@5372 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/wscript | 4 | ||||
| -rw-r--r-- | wscript | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 3ab48abf77..c58d74384e 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -268,9 +268,9 @@ def build(bld): if bld.env['FPU_OPTIMIZATION']: obj.source += ' sse_functions_xmm.cc' if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686': - obj.source += ' sse_functions.S' + obj.source += ' sse_functions.s' elif bld.env['build_target'] == 'x86_64': - obj.source += ' sse_functions_64bit.S' + obj.source += ' sse_functions_64bit.s' if bld.env['HAVE_CPPUNIT']: # Unit tests @@ -116,9 +116,6 @@ def set_compiler_flags (conf,opt): conf.define ('build_target', 'powerpc') else: conf.define ('build_target', 'i686') - print "\n*******************************" - print "detected DIST_TARGET = " + conf.env['build_target'] - print "*******************************\n" else: conf.define ('build_target', opt.dist_target) @@ -359,8 +356,6 @@ def configure(conf): # Fix utterly braindead FLAC include path to not smash assert.h conf.env['CPPPATH_FLAC'] = [] - set_compiler_flags (conf, Options.options) - # Tell everyone that this is a waf build conf.env.append_value('CCFLAGS', '-DWAF_BUILD') @@ -404,6 +399,9 @@ def configure(conf): autowaf.display_msg(conf, 'Windows Key', opts.windows_key) if opts.windows_key: conf.define('WINDOWS_KEY', opts.windows_key) + + set_compiler_flags (conf, Options.options) + autowaf.display_msg(conf, 'C Compiler flags', conf.env['CCFLAGS']) autowaf.display_msg(conf, 'C++ Compiler flags', conf.env['CXXFLAGS']) |