smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

hopefully fix the build, and actually use the options

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5372 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-07-17 22:25:32 +00:00
parent 7884727e78
commit b89a786b3e
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/wscript
View file

@ -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

8
wscript
View file

@ -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'])