hopefully fix the build, and actually use the options

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

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 3ab48abf779cff03bad921ce0d1252e2fd5fe205..c58d74384effeed1ab9699dd22a80ac552b7f05c 100644 (file)
--- 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

diff --git a/wscript b/wscript
index 210573b7aa67b978b005888b0ee1c502c3b35c08..648402894990e7937077c8b3435d646c258bb27c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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'])