added mutable keyword to gints used in glib atomic operations to satisfy compiler...

[ardour.git] / libs / ardour / SConscript

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 9393f7f74ceb2d6d717d3fdc1e1ab04b8f48bf0d..0fb5cfc78880f088e68f3cffa8998b6ac062174e 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -20,6 +20,12 @@ ardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 ardour.Append(PACKAGE = domain)
 ardour.Append(POTFILE = domain + '.pot')
 
+#
+# explicitly reference the control protocol LGPL library for includes
+# 
+ 
+ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
+
 ardour_files=Split("""
 audio_library.cc
 audio_playlist.cc
@@ -30,10 +36,8 @@ audioregion.cc
 auditioner.cc
 automation.cc
 automation_event.cc
-basic_ui.cc
 configuration.cc
 connection.cc
-control_protocol.cc
 control_protocol_manager.cc
 crossfade.cc
 curve.cc
@@ -54,7 +58,6 @@ ladspa_plugin.cc
 location.cc
 mtc_slave.cc
 named_selection.cc
-osc.cc
 panner.cc
 pcm_utils.cc
 playlist.cc
@@ -93,6 +96,7 @@ mix.cc
 
 arch_specific_objects = [ ]
 
+osc_files = [ 'osc.cc' ]
 vst_files = [ 'vst_plugin.cc', 'session_vst.cc' ]
 coreaudio_files = [ 'coreaudio_source.cc' ]
 extra_sources = [ ]
@@ -100,6 +104,9 @@ extra_sources = [ ]
 if ardour['VST']:
        extra_sources += vst_files
 
+if ardour['LIBLO']:
+    extra_sources += osc_files
+
 ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 ardour.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
 ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\""+final_prefix+"/lib\\\"")
@@ -168,9 +175,17 @@ if conf.CheckCHeader('sys/vfs.h'):
 if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
     ardour.Append(LINKFLAGS="-framework CoreMIDI")
 
-if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h'):
+if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h') and ardour['COREAUDIO'] == 1:
     ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO")    
     ardour.Append(LINKFLAGS="-framework AudioToolbox")
+    
+
+if env['CONFIG_ARCH'] == 'apple':
+    # this next line avoids issues with circular dependencies between libardour and libardour_cp.
+    # it is based on the (entirely reasonable) assumption that a system with CoreAudio is OS X
+    #
+    print 'APPLE CONFIG'
+    ardour.Append(LINKFLAGS='-undefined suppress -flat_namespace') 
     extra_sources += coreaudio_files
 
 ardour = conf.Finish ()
@@ -179,15 +194,19 @@ ardour.Merge ([
             libraries['core'],
             libraries['xml'],
             libraries['sndfile'],
+            libraries['raptor'],
             libraries['lrdf'],
             libraries['samplerate'],
             libraries['sigc2'],
             libraries['pbd3'],
             libraries['soundtouch'],
             libraries['midi++2'],
-            libraries['lo'],
+             libraries['glib2'],
+             libraries['glibmm2']
             ])
 
+if ardour['LIBLO']:
+    ardour.Merge ([ libraries['lo'] ])
 
 ardour.VersionBuild(['version.cc', 'ardour/version.h'], 'SConscript')