X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=43b45e10398e8f6d1c7d0600c858fd926148ee51;hb=756ffc26bffa6a6c9276d6f4fff5b47cc54ad35a;hp=52a28f286f867dfb453b45fc63c5dbdaf829dc53;hpb=71df3719d4b77f63596ffb5b478bf9d2aa2edf97;p=ardour.git

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 52a28f286f..43b45e1039 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -28,6 +28,7 @@ gtk2_ardour_sources = [
 	'actions.cc',
 	'add_midi_cc_track_dialog.cc',
 	'add_route_dialog.cc',
+	'ambiguous_file_dialog.cc',
 	'analysis_window.cc',
 	'ardour_dialog.cc',
 	'ardour_ui.cc',
@@ -54,7 +55,7 @@ gtk2_ardour_sources = [
 	'canvas-hit.cc',
 	'canvas-note-event.cc',
 	'canvas-note.cc',
-	'canvas-program-change.cc',
+	'canvas_patch_change.cc',
 	'canvas-simpleline.c',
 	'canvas-simplerect.c',
 	'canvas-sysex.cc',
@@ -142,11 +143,15 @@ gtk2_ardour_sources = [
 	'midi_time_axis.cc',
 	'midi_tracer.cc',
         'missing_file_dialog.cc',
+	'missing_plugin_dialog.cc',
 	'mixer_group_tabs.cc',
 	'mixer_strip.cc',
 	'mixer_ui.cc',
         'monitor_section.cc',
+        'mono_panner.cc',
+	'mouse_cursors.cc',
 	'nag.cc',
+	'new_plugin_preset_dialog.cc',
 	'normalize_dialog.cc',
         'note_player.cc',
 	'option_editor.cc',
@@ -169,6 +174,7 @@ gtk2_ardour_sources = [
 	'port_matrix_labels.cc',
 	'port_matrix_row_labels.cc',
 	'processor_box.cc',
+	'patch_change_dialog.cc',
 	'progress_reporter.cc',
 	'prompter.cc',
 	'public_editor.cc',
@@ -200,6 +206,7 @@ gtk2_ardour_sources = [
 	'startup.cc',
         'step_editor.cc',
         'step_entry.cc',
+        'stereo_panner.cc',
 	'streamview.cc',
 	'strip_silence_dialog.cc',
 	'tape_region_view.cc',
@@ -240,7 +247,6 @@ def configure(conf):
 	autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD', atleast_version='2.10.1')
 	autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
 	autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18')
-	autowaf.check_pkg(conf, 'libgnomecanvas-2.0', uselib_store='GNOMECANVAS', atleast_version='2.0')
 	autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16')
 	autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
 
@@ -276,10 +282,13 @@ def build(bld):
 	else:
 		obj.target = 'ardour-3.0'
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-	obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA CURL DL'
-	obj.uselib       += ' GTKMM GNOMECANVASMM OSX GTKOSX COREAUDIO'
+	obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL'
+	obj.uselib       += ' GTKMM GNOMECANVASMM '
+	obj.uselib       += ' AUDIOUNITS OSX GTKOSX '
 	obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp
-	                      libgtkmm2ext libtaglib'''
+	                      libgtkmm2ext libtaglib libgnomecanvas-2'''
+        if sys.platform == 'darwin':
+                obj.uselib_local + ' libappleutility'
 	obj.cflags       = ['-DPACKAGE="gtk2_ardour"']
 	obj.cxxflags     = ['-DPACKAGE="gtk2_ardour"']
 	obj.cxxflags     += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"']
@@ -289,6 +298,7 @@ def build(bld):
 	obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
 			os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
 	obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
+	obj.cxxflags     += ['-I../libs']
 
 	if bld.env['HAVE_SLV2']:
 		obj.source += [ 'lv2_plugin_ui.cc' ]
@@ -304,14 +314,10 @@ def build(bld):
 	if bld.env['PHONE_HOME']:
 		obj.cxxflags += [ '-DPHONE_HOME' ]
 
-	if bld.env['GTKOSX']:
+	if bld.env['COREAUDIO']:
 		TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
-		obj.source += [ 'cocoacarbon.mm' ]
-
-		if bld.env['AUDIOUNITS']:
-			obj.source += [ 'au_pluginui.mm' ]
-			obj.uselib_local += ' libappleutility '
-
+		obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
+		obj.uselib_local += ' libappleutility '
 	else:
 		obj.source += [ 'x11.cc' ]
 
@@ -346,13 +352,13 @@ def build(bld):
 	obj              = bld.new_task_gen('subst')
 	obj.source       = 'ardev_common.sh.in'
 	obj.target       = 'ardev_common_waf.sh'
-	obj.chmod        = 0o755
+	obj.chmod        = 0755
 	obj.dict         = wrapper_subst_dict
 
 	obj              = bld.new_task_gen('subst')
 	obj.source       = 'ardour.sh.in'
 	obj.target       = 'ardour3'
-	obj.chmod        = 0o755
+	obj.chmod        = 0755
 	obj.dict         = wrapper_subst_dict
 	obj.install_path = bld.env['BINDIR']
 
@@ -469,6 +475,9 @@ def build(bld):
 
 	# Default UI configuration
 	bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
+	
+	# Default export stuff
+	bld.install_files('${CONFIGDIR}/ardour3/export', 'export/*.format')
 
 	# i18n
 	if bld.env['ENABLE_NLS']: