diff options
author | David Robillard <d@drobilla.net> | 2006-06-21 18:14:45 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-06-21 18:14:45 +0000 |
commit | 13532c8500dce5f7a4525bcdfc3b44936fbaa5e6 (patch) | |
tree | 6877b3c3122968665454cd1a1cbb104151c5b788 /SConstruct | |
parent | 6a1f2919f20286b7d51de8e9c02107ab42f8e763 (diff) |
Merged with trunk
git-svn-id: svn://localhost/ardour2/branches/midi@628 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/SConstruct b/SConstruct index f6ea965e29..c67cb4d03e 100644 --- a/SConstruct +++ b/SConstruct @@ -14,7 +14,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -version = '2.0beta1' +version = '2.0beta2' subst_dict = { } @@ -25,20 +25,20 @@ subst_dict = { } opts = Options('scache.conf') opts.AddOptions( ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), - BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0), + BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'), - BoolOption('NLS', 'Set to turn on i18n support', 1), - PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), - BoolOption('VST', 'Compile with support for VST', 0), - BoolOption('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0), EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2), - BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), - BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0), - BoolOption('SURFACES', 'Build support for control surfaces', 0), BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), + BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0), + BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), BoolOption('LIBLO', 'Compile with support for liblo library', 1), - BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library -- UNSTABLE', 0) + BoolOption('NLS', 'Set to turn on i18n support', 1), + PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), + BoolOption('SURFACES', 'Build support for control surfaces', 0), + BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0), + BoolOption('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0), + BoolOption('VST', 'Compile with support for VST', 0) ) #---------------------------------------------------------------------- @@ -58,8 +58,8 @@ class LibraryInfo(Environment): self.Append (LINKFLAGS = other.get('LINKFLAGS', [])) self.Replace(LIBPATH = list(Set(self.get('LIBPATH', [])))) self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[])))) - #doing LINKFLAGS breaks -framework - #doing LIBS break link order dependency + #doing LINKFLAGS breaks -framework + #doing LIBS break link order dependency env = LibraryInfo (options = opts, @@ -408,10 +408,6 @@ libraries['pbd3'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd3', CPPPATH='# libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext') #libraries['cassowary'] = LibraryInfo(LIBS='cassowary', LIBPATH='#libs/cassowary', CPPPATH='#libs/cassowary') -libraries['fst'] = LibraryInfo() -if env['VST']: - libraries['fst'].ParseConfig('pkg-config --cflags --libs libfst') - # # Check for libusb @@ -539,6 +535,9 @@ if env['SYSLIBS']: 'libs/ardour' ] + if env['VST']: + subdirs = ['libs/fst'] + subdirs + ['vst'] + gtk_subdirs = [ # 'libs/flowcanvas', 'libs/gtkmm2ext', @@ -592,6 +591,9 @@ else: 'libs/ardour' ] + if env['VST']: + subdirs = ['libs/fst'] + subdirs + ['vst'] + gtk_subdirs = [ 'libs/glibmm2', 'libs/gtkmm2/pango', @@ -794,10 +796,12 @@ if env['DEBUG'] == 1: else: env.Append(CCFLAGS=" ".join (opt_flags)) -env.Append(CCFLAGS="-Wall") +# +# warnings flags +# -if env['VST']: - env.Append(CCFLAGS="-DVST_SUPPORT") +env.Append(CCFLAGS="-Wall") +env.Append(CXXFLAGS="-Woverloaded-virtual") if env['LIBLO']: env.Append(CCFLAGS="-DHAVE_LIBLO") |