Remove unnecessary header usage.

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index b670a6d9694c26d3f0baf49bb8028075b0895b3a..daeac690ce67b47f3103807028c687f3a3e1c2d0 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -26,9 +26,8 @@ gtkardour.Merge ([
     libraries['ardour'],
     libraries['ardour_cp'],
     libraries['gtkmm2ext'],
-#    libraries['flowcanvas'],
     libraries['midi++2'],
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['gtkmm2'],
     libraries['glib2'],
     libraries['libgnomecanvas2'],
@@ -58,13 +57,14 @@ if gtkardour['FFT_ANALYSIS']:
        gtkardour.Merge ([libraries['fftw3f']])
        gtkardour.Append(CCFLAGS='-DFFT_ANALYSIS')
 
-if gtkardour['VST']:
-    gtkardour.Merge ([ libraries['fst']])
-
 skipped_files=Split("""
 connection_editor.cc
 """)
 
+coreaudio_files=Split("""
+au_pluginui.cc
+""")
+
 gtkardour_files=Split("""
 about.cc
 actions.cc
@@ -78,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
@@ -138,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
@@ -162,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
@@ -173,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
@@ -203,15 +205,22 @@ itest.cc
 """)
 
 extra_sources = []
+
 vst_files = [ 'vst_pluginui.cc' ]
 
 if env['VST']:
-   extra_sources += vst_files
-
+       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
 
-
 intl_files += extra_sources
 
 gtkardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
@@ -226,6 +235,8 @@ gtkardour.VersionBuild(['version.cc','version.h'], 'SConscript')
 executable = 'ardour.bin'
 
 ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources)
+ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_files + extra_sources)
+
 mtest = gtkardour.Program(target = 'mtest', source = mtest_files)
 itest = gtkardour.Program(target = 'itest', source = itest_files)
 
@@ -235,21 +246,27 @@ my_subst_dict['%INSTALL_PREFIX%'] = install_prefix
 ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
 
-Default(ardour)
+if env['VST']:
+       Default(ardourlib)
+       # the library - into the library dir
+       env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardourlib))
+else:
+
+       if env['VERSIONED']:
+               Default (env.VersionedExecutable ('tagged_executable', ardour))
+       else:
+               Default(ardour)
 
-if env['VERSIONED']:
-    Default (env.VersionedExecutable ('tagged_executable', ardour))
+        #install
+
+       # the executable - into the library dir
+       env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour))
+       # the script - into the bin dir
+       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)
     
-#install
-
-# the executable - into the library dir
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour))
-# the script - into the bin dir
-env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh))
 # configuration files
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui.rc'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus'))
@@ -259,6 +276,7 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), 'splash.ppm'))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files))
 
+               
 #dist
 env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                       [ 'SConscript',