X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=9cc2a508aaef7d6ff9a1d5f0b06ffc313934cfd1;hb=537b3a2a0e34f1e49d47b8a51d08c690e02f1454;hp=4cfcde79ef3e55d5b24fe8844ac3325d9f121edd;hpb=113bc3b38ec01f742752f4be8ddf1c24630ccd2d;p=ardour.git

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 4cfcde79ef..9cc2a508aa 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -109,6 +109,7 @@ gtk2_ardour_sources = [
         'gtk_pianokeyboard.c',
         'gui_object.cc',
         'insert_time_dialog.cc',
+        'instrument_selector.cc',
         'interthread_progress_window.cc',
         'io_selector.cc',
         'hit.cc',
@@ -230,13 +231,14 @@ gtk2_ardour_sources = [
         'time_fx_dialog.cc',
         'time_info_box.cc',
         'time_selection.cc',
+        'timers.cc',
         'track_selection.cc',
         'track_view_list.cc',
+        'transform_dialog.cc',
         'transpose_dialog.cc',
         'ui_config.cc',
         'utils.cc',
         'verbose_cursor.cc',
-        'version.cc',
         'visibility_group.cc',
         'volume_controller.cc',
         'window_manager.cc',
@@ -251,21 +253,30 @@ gtk2_ardour_sources = [
         'video_server_dialog.cc',
         'utils_videotl.cc',
         'export_video_dialog.cc',
-        'export_video_infobox.cc'
+        'export_video_infobox.cc',
+        'video_tool_paths.cc'
 ]
 
+def enoify (major, minor):
+    if major == 3:
+        return "\\n\\\"E-No\\\""
+    elif major == 4:
+        if minor == 0:
+            return "\\n\\\"No Pussyfooting\\\""
+        elif minor == 1:
+            return "\\n\\\"Here Come the Warm Jets\\\""
+        elif minor == 2:
+            return "\\n\\\"Taking Tiger Mountain\\\""
+        elif minor == 3:
+            return "\\n\\\"Lady June's Linguistic Leprosy\\\""
+    return "\\\"\\\""
+
 def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
     conf.load('misc')
     conf.load('compiler_cxx')
-    # we don't use hard-coded micro versions with ardour, so hard code it to zero
-    autowaf.build_version_files(
-        path_prefix + 'version.h',
-        path_prefix + 'version.cc',
-        'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0,
-        '', '')
     autowaf.configure(conf)
 
     # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present
@@ -288,7 +299,8 @@ def configure(conf):
 
     bak = conf.env['define_key']
     conf.define('VERSIONSTRING', str (conf.env['VERSION']))
-    conf.env['define_key'] = ['VERSIONSTRING']
+    conf.define('CODENAME', enoify(int(conf.env['MAJOR']), int(conf.env['MINOR'])))
+    conf.env['define_key'] = ['VERSIONSTRING', 'CODENAME' ]
     conf.write_config_header('gtk2ardour-version.h')
     conf.env['define_key'] = bak;
 
@@ -371,10 +383,7 @@ def build(bld):
         # If we require VST support we build a stub main() and the FST library
         # here using winegcc, and link it to the GTK front-end library
         obj = bld (features = 'cxx c cxxprogram wine')
-        obj.source = (
-            '../libs/fst/vstwin.c',
-            '../vst/winmain.c',
-            )
+        obj.source = ( '../libs/fst/vstwin.c', '../vst/winmain.c' )
         #
         # XXX do we really need to explicitly link to all of these for the wine executable?
         #
@@ -386,11 +395,12 @@ def build(bld):
                              'libmidipp',
                              'libgtk2_ardour',
                              'libgtkmm2ext',
-                             'libcanvas'
+                             'libcanvas',
                              ]
         obj.target = 'ardour-' + str (bld.env['VERSION']) + '-vst.exe.so'
         obj.includes  = [ '../libs/fst', '.' ]
         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
+        obj.linkflags += bld.env['LDFLAGS']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
         obj.install_path = bld.env['DLLDIR']
         # end of the wine executable
@@ -453,8 +463,7 @@ def build(bld):
     obj.includes += ['../libs']
 
     if bld.env['build_target'] == 'mingw':
-        if bld.env['DEBUG'] == False:
-            obj.linkflags = ['-mwindows']
+        obj.linkflags = ['-mwindows']
 
     if bld.is_defined('HAVE_SUIL'):
         obj.source += [ 'lv2_plugin_ui.cc' ]
@@ -503,7 +512,7 @@ def build(bld):
         for i in dict:
             setattr(obj, i, dict[i])
 
-    obj              = bld(features = 'subst', rule= 'chmod 0755 ${TGT}')
+    obj              = bld(features = 'subst')
     obj.source       = 'ardev_common.sh.in'
     obj.target       = 'ardev_common_waf.sh'
     obj.chmod        = Utils.O755
@@ -512,7 +521,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']
@@ -521,7 +530,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']
@@ -558,7 +567,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
@@ -575,6 +585,7 @@ def build(bld):
         }
         font_names = {
                 'MONOSPACE' : 'ArdourMono',
+                'CLOCKFONT' : 'ArdourMono',
         }
 
     # Set up font substitution dictionary
@@ -669,7 +680,7 @@ def build(bld):
     bld.install_files(bld.env['CONFDIR'], 'dark.colors')
 
     # Default export stuff
-    bld.install_files(os.path.join(bld.env['CONFDIR'],' export'), bld.path.ant_glob('export/*.format'))
+    bld.install_files(os.path.join(bld.env['CONFDIR'], 'export'), bld.path.ant_glob('export/*.format'))
 
     # i18n
     if bld.is_defined('ENABLE_NLS'):