Use uint32_t type instead of uint

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 02e163e3eea7ed81da463636aeec305266b39629..bb4e2035ec6ad10a9c7bc54fd38cc57cb1738895 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -8,15 +8,6 @@ import re
 import time
 from waflib.Task import Task
 
-# Version of this package (even if built as a child)
-MAJOR = '3'
-MINOR = '0'
-MICRO = '0'
-GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
-
-# Variables for 'waf dist'
-APPNAME = 'gtk2_ardour3'
-VERSION = GTK2_ARDOUR_VERSION
 I18N_PACKAGE = 'gtk2_ardour3'
 
 # Mandatory variables
@@ -52,6 +43,7 @@ gtk2_ardour_sources = [
         'automation_streamview.cc',
         'automation_time_axis.cc',
         'axis_view.cc',
+        'big_clock_window.cc',
         'bundle_manager.cc',
         'button_joiner.cc',
         'canvas-flag.cc',
@@ -153,6 +145,9 @@ gtk2_ardour_sources = [
         'mixer_group_tabs.cc',
         'mixer_strip.cc',
         'mixer_ui.cc',
+        'meterbridge.cc',
+        'meter_strip.cc',
+        'meter_patterns.cc',
         'monitor_section.cc',
         'mono_panner.cc',
         'mono_panner_editor.cc',
@@ -242,7 +237,7 @@ gtk2_ardour_sources = [
         'visibility_group.cc',
         'volume_controller.cc',
         'waveview.cc',
-        'window_proxy.cc',
+        'window_manager.cc',
 # video-timeline related sources:
         'video_image_frame.cc',
         'add_video_dialog.cc',
@@ -264,10 +259,11 @@ def 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', MAJOR, MINOR, MICRO)
+        'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0)
     autowaf.configure(conf)
 
     if re.search ("linux", sys.platform) != None:
@@ -365,6 +361,8 @@ def build_color_scheme(path, prefix):
 
 def build(bld):
 
+    VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])
+
     if bld.is_defined('WINDOWS_VST_SUPPORT'):
         # 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
@@ -385,7 +383,7 @@ def build(bld):
                              'libgtk2_ardour',
                              'libgtkmm2ext',
                              'libtaglib']
-        obj.target = 'ardour-3.0-vst.exe.so'
+        obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
         obj.includes  = [ '../libs/fst', '.' ]
         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
@@ -402,7 +400,7 @@ def build(bld):
         # just the normal executable version of the GTK GUI
         obj = bld(features = 'cxx c cxxprogram')
         obj.source    = gtk2_ardour_sources
-        obj.target = 'ardour-3.0'
+        obj.target = 'ardour-' + bld.env['VERSION']
         obj.includes = ['.']
 
     # continue with setup of obj, which could be a shared library
@@ -475,8 +473,8 @@ def build(bld):
             'DATADIR'        : os.path.normpath(bld.env['DATADIR']),
             'SYSCONFDIR'     : os.path.normpath(bld.env['SYSCONFDIR']),
             'LIBS'           : 'build/libs',
-            'VERSION'        : '3.0',
-            'EXECUTABLE'     : 'build/gtk2_ardour/ardour-3.0'
+            'VERSION'        : bld.env['VERSION'],
+            'EXECUTABLE'     : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
     }
 
     def set_subst_dict(obj, dict):
@@ -648,7 +646,7 @@ def build(bld):
     # Menus
     menus_argv = []
     if bld.is_defined('GTKOSX'):
-        menus_argv = [ '-E', '-P', '-DGTKOSX' ]
+        menus_argv = [ '-E', '-P', '-DGTKOSX', '-DNOVIDEOTIMELINE' ]
     else:
         menus_argv = [ '-E', '-P' ]