X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=84db23987fd41a200d9144d46cc1e7a213fb473e;hb=a14c7ff066476aae1a30b3573c90153ed1565e66;hp=e20d93fa70daf0c5b41c216f81c67164322085be;hpb=8217bd07f292735f9ecb0638e6fe533df40fcf98;p=ardour.git

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index e20d93fa70..84db23987f 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -10,8 +10,6 @@ import time
 from waflib.Task import Task
 from waflib.Tools import winres
 
-I18N_PACKAGE = 'gtk2_ardour3'
-
 # Mandatory variables
 top = '.'
 out = 'build'
@@ -146,6 +144,7 @@ gtk2_ardour_sources = [
         'meter_strip.cc',
         'meter_patterns.cc',
         'monitor_section.cc',
+        'monitor_selector.cc',
         'mono_panner.cc',
         'mono_panner_editor.cc',
         'mouse_cursors.cc',
@@ -201,6 +200,7 @@ gtk2_ardour_sources = [
         'route_time_axis.cc',
         'route_ui.cc',
         'ruler_dialog.cc',
+	'save_as_dialog.cc',
         'search_path_option.cc',
         'selection.cc',
         'selection_memento.cc',
@@ -377,6 +377,7 @@ def build_color_scheme(path, prefix):
 def build(bld):
 
     VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])
+    I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
 
     if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
         # Windows VST support w/wine
@@ -521,7 +522,7 @@ def build(bld):
 
     obj              = bld(features = 'subst')
     obj.source       = 'ardour.sh.in'
-    obj.target       = 'ardour3'
+    obj.target       = 'ardour' + str (bld.env['MAJOR'])
     obj.chmod        = Utils.O755
     obj.dict         = wrapper_subst_dict
     obj.install_path = bld.env['BINDIR']
@@ -530,7 +531,7 @@ def build(bld):
     if bld.is_defined('WINDOWS_VST_SUPPORT'):
         obj              = bld(features = 'subst')
         obj.source       = '../vst/ardourvst.in'
-        obj.target       = 'ardourvst3'
+        obj.target       = 'ardourvst' + str (bld.env['MAJOR'])
         obj.chmod        = Utils.O755
         obj.dict         = wrapper_subst_dict
         obj.install_path = bld.env['BINDIR']
@@ -567,7 +568,8 @@ def build(bld):
         # so just use it.
         #
         font_names = {
-            'MONOSPACE' : 'Lucida Grande',
+            'MONOSPACE' : 'Monaco',
+            'CLOCKFONT' : 'Lucida Grande',
         }
     else: # Linux/X11 fonts
         basefont = '' # unspecified - use system defaults
@@ -584,6 +586,7 @@ def build(bld):
         }
         font_names = {
                 'MONOSPACE' : 'ArdourMono',
+                'CLOCKFONT' : 'ArdourMono',
         }
 
     # Set up font substitution dictionary
@@ -638,7 +641,7 @@ def build(bld):
         obj.command_is_external = True
         obj.no_inputs = True
         obj.argv = menus_argv
-        obj.dep_vars = ['GTKOSX']
+        obj.dep_vars = ['GTKOSX', 'WINDOWS']
         obj.stdin = program + '.menus.in'
         obj.stdout = program + '.menus'
         bld.install_files (bld.env['CONFDIR'], program + '.menus')
@@ -689,17 +692,21 @@ def build(bld):
                             mo)
 
 def i18n(bld):
-    autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
-                       'Paul Davis')
-
+	I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
+	autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+	                   'Paul Davis')
+	
 def i18n_pot(bld):
-    autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
-                       'Paul Davis')
+	I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
+	autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+	                       'Paul Davis')
 
 def i18n_po(bld):
-    autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
-                       'Paul Davis')
-
+	I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
+	autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+	                      'Paul Davis')
+	
 def i18n_mo(bld):
-    autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
-                       'Paul Davis')
+	I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
+	autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+	                      'Paul Davis')