merge from trunk

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 65f8dfca732bb618ee8297bd6b539ec1d06d8902..658caac1e3324788ea016a1795bf036b0b0b9065 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -27,7 +27,7 @@ gtkardour.Merge ([
     libraries['ardour_cp'],
     libraries['gtkmm2ext'],
     libraries['midi++2'],
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['gtkmm2'],
     libraries['glib2'],
     libraries['libgnomecanvas2'],
@@ -61,6 +61,9 @@ skipped_files=Split("""
 connection_editor.cc
 """)
 
+coreaudio_files=Split("""
+au_pluginui.cc
+""")
 
 gtkardour_files=Split("""
 about.cc
@@ -75,6 +78,7 @@ ardour_ui_ed.cc
 ardour_ui_mixer.cc
 ardour_ui_options.cc
 audio_clock.cc
+route_time_axis.cc
 audio_time_axis.cc
 automation_gain_line.cc
 automation_line.cc
@@ -135,14 +139,13 @@ imageframe_time_axis_view.cc
 imageframe_view.cc
 io_selector.cc
 keyboard.cc
+ladspa_pluginui.cc
 location_ui.cc
 main.cc
 marker.cc
 marker_time_axis.cc
 marker_time_axis_view.cc
 marker_view.cc
-meter_bridge.cc
-meter_bridge_strip.cc
 mixer_strip.cc
 mixer_ui.cc
 new_session_dialog.cc
@@ -159,10 +162,11 @@ public_editor.cc
 redirect_automation_line.cc
 redirect_automation_time_axis.cc
 redirect_box.cc
-region_editor.cc
+audio_region_editor.cc
 region_gain_line.cc
 region_selection.cc
-regionview.cc
+region_view.cc
+audio_region_view.cc
 route_params_ui.cc
 route_redirect_selection.cc
 route_ui.cc
@@ -170,7 +174,8 @@ selection.cc
 sfdb_ui.cc
 send_ui.cc
 streamview.cc
-taperegionview.cc
+audio_streamview.cc
+tape_region_view.cc
 tempo_dialog.cc
 time_axis_view.cc
 time_axis_view_item.cc
@@ -181,7 +186,6 @@ visual_time_axis.cc
 waveview.cc
 """)
 
-
 fft_analysis_files=Split("""
 analysis_window.cc
 fft_graph.cc
@@ -196,6 +200,11 @@ mtest_files=Split("""
 mtest.cc
 """)
 
+
+rcu_files=Split("""
+rcu.cc
+""")
+
 itest_files=Split("""
 itest.cc
 """)
@@ -207,7 +216,13 @@ vst_files = [ 'vst_pluginui.cc' ]
 if env['VST']:
        extra_sources += vst_files
        gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
-  
+
+if gtkardour['COREAUDIO']:
+    extra_sources += coreaudio_files
+    gtkardour.Append(CCFLAGS='-DHAVE_COREAUDIO')
+    gtkardour.Append(LINKFLAGS='-framework Carbon')
+    gtkardour.Merge([libraries['appleutility']])
+ 
 if env['FFT_ANALYSIS']:
        extra_sources += fft_analysis_files
 
@@ -229,6 +244,7 @@ ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_fil
 
 mtest = gtkardour.Program(target = 'mtest', source = mtest_files)
 itest = gtkardour.Program(target = 'itest', source = itest_files)
+rcu = gtkardour.Program(target = 'rcu', source = rcu_files)
 
 my_subst_dict = { }
 my_subst_dict['%INSTALL_PREFIX%'] = install_prefix
@@ -255,8 +271,7 @@ else:
        env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh))
 
 if env['NLS']:
-        Export('gtkardour', 'intl_files')
-       SConscript ('po/SConscript')
+       i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env)
     
 # configuration files
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui.rc'))