diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-06-07 14:54:12 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-06-07 14:54:12 +0000 |
| commit | 9fdc36bac5fa1c004751c0dd42f9ff62b9d60814 (patch) | |
| tree | 34a2d26c5cadcbe5c31b424e3e50a34a4360d87b /SConstruct | |
| parent | 55ba7c46c60d3cc9938abc34252fa930f1c883cb (diff) | |
Merged timbyr's win32 branch. -r 547:566.
git-svn-id: svn://localhost/ardour2/trunk@567 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index 1403b69c8a..64f0234869 100644 --- a/SConstruct +++ b/SConstruct @@ -36,8 +36,9 @@ opts.AddOptions( 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('DMALLOC', 'Compile and link using the dmalloc library', 0), + BoolOption('LIBLO', 'Compile with support for liblo library', 1) +) #---------------------------------------------------------------------- # a handy helper that provides a way to merge compile/link information @@ -380,6 +381,7 @@ libraries['glib2'] = LibraryInfo() libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gmodule-2.0') +libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0') libraries['gtk2'] = LibraryInfo() libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0') @@ -425,14 +427,15 @@ libraries['usb'] = conf.Finish () # # Check for liblo -libraries['lo'] = LibraryInfo () +if env['LIBLO']: + libraries['lo'] = LibraryInfo () -conf = Configure (libraries['lo']) -if conf.CheckLib ('lo', 'lo_server_new') == False: - print "liblo does not appear to be installed." - exit (0) + conf = Configure (libraries['lo']) + if conf.CheckLib ('lo', 'lo_server_new') == False: + print "liblo does not appear to be installed." + sys.exit (1) -libraries['lo'] = conf.Finish () + libraries['lo'] = conf.Finish () # # Check for dmalloc @@ -470,7 +473,10 @@ elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/Co env['SYSMIDI'] = 'CoreMIDI' subst_dict['%MIDITAG%'] = "ardour" subst_dict['%MIDITYPE%'] = "coremidi" - +else: + print "It appears you don't have the required MIDI libraries installed." + sys.exit (1) + env = conf.Finish() if env['SYSLIBS']: @@ -757,6 +763,9 @@ env.Append(CCFLAGS="-Wall") if env['VST']: env.Append(CCFLAGS="-DVST_SUPPORT") +if env['LIBLO']: + env.Append(CCFLAGS="-DHAVE_LIBLO") + # # everybody needs this # |