X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=398bd57248829b1d12aee7d28f96a1e53d2c7e70;hb=eed6d13b60ccba041ad710798832efa86ae39d12;hp=ac8f09c27e1a4153e87d20552f82b67eabb2c201;hpb=62d2d22b4425dabe22dc2a97f2b375907dc0f65e;p=ardour.git

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index ac8f09c27e..398bd57248 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -11,11 +11,18 @@ from waflib.Task import Task
 from waflib.Tools import winres
 import subprocess
 import glob
+import copy
 
 # Mandatory variables
 top = '.'
 out = 'build'
 
+from waflib import TaskGen
+@TaskGen.extension('.m')
+def m_hook(self, node):
+	"""Alias .m files to be compiled the same as .c files, gcc will do the right thing."""
+	return self.create_compiled_task('c', node)
+
 path_prefix = 'gtk2_ardour/'
 
 gtk2_ardour_sources = [
@@ -28,7 +35,9 @@ gtk2_ardour_sources = [
         'ardour_dialog.cc',
         'ardour_display.cc',
         'ardour_dropdown.cc',
+        'ardour_http.cc',
         'ardour_knob.cc',
+        'ardour_spinner.cc',
         'ardour_ui.cc',
         'ardour_ui2.cc',
         'ardour_ui_dependents.cc',
@@ -52,9 +61,11 @@ gtk2_ardour_sources = [
         'bundle_manager.cc',
         'button_joiner.cc',
         'clock_group.cc',
+        'color_theme_manager.cc',
         'configinfo.cc',
         'control_point.cc',
         'control_point_dialog.cc',
+        'control_slave_ui.cc',
         'cursor_context.cc',
         'curvetest.cc',
         'debug.cc',
@@ -144,7 +155,6 @@ gtk2_ardour_sources = [
         'midi_velocity_dialog.cc',
         'missing_file_dialog.cc',
         'missing_plugin_dialog.cc',
-        'mixer_actor.cc',
         'mixer_group_tabs.cc',
         'mixer_strip.cc',
         'mixer_ui.cc',
@@ -177,6 +187,7 @@ gtk2_ardour_sources = [
         'playlist_selector.cc',
         'plugin_eq_gui.cc',
         'plugin_pin_dialog.cc',
+        'plugin_setup_dialog.cc',
         'plugin_selector.cc',
         'plugin_ui.cc',
         'port_group.cc',
@@ -233,6 +244,7 @@ gtk2_ardour_sources = [
         'strip_silence_dialog.cc',
         'sys_ex.cc',
         'tape_region_view.cc',
+        'tempo_curve.cc',
         'tempo_dialog.cc',
         'tempo_lines.cc',
         'theme_manager.cc',
@@ -249,6 +261,7 @@ gtk2_ardour_sources = [
         'transpose_dialog.cc',
         'ui_config.cc',
         'utils.cc',
+        'vca_master_strip.cc',
         'verbose_cursor.cc',
         'visibility_group.cc',
         'window_manager.cc',
@@ -256,6 +269,7 @@ gtk2_ardour_sources = [
         'video_image_frame.cc',
         'add_video_dialog.cc',
         'editor_videotimeline.cc',
+        'vca_time_axis.cc',
         'video_timeline.cc',
         'video_monitor.cc',
         'transcode_ffmpeg.cc',
@@ -292,8 +306,11 @@ def enoify (major, minor):
             return "\\n\\\"Evening Star\\\""
         elif minor == 7:
             return "\\n\\\"Cluster and Eno\\\""
-        elif minor == 8:
+    elif major == 5:
+        if minor == 0:
             return "\\n\\\"Before and After Science\\\""
+        elif minor == 1:
+            return "\\n\\\"After the Heat\\\""
     return "\\\"\\\""
 
 def options(opt):
@@ -322,6 +339,23 @@ def configure(conf):
     autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.1', mandatory=False)
     autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG')
 
+
+    if sys.platform == 'darwin':
+        retval = conf.run_c_code (code='#include <AppKit/NSWindow.h>\n\
+        int main(void) { (void) NSWindowWillStartLiveResizeNotification; return 0; }\n',
+                                  env = conf.env.derive (),
+                                  features = [ 'c' ],
+                                  compiler = 'cc',
+                                  compile_filename='test.m',
+                                  mandatory = False,
+            )
+
+        if retval == 0:
+            autowaf.display_msg (conf, 'Checking for Cocoa live resizing constants', 'ok')
+            conf.define ('HAVE_COCOA_LIVE_RESIZING', 1)
+        else:
+            autowaf.display_msg (conf, 'Checking for Cocoa live resizing constants', 'too old - AU plugin windows will be fixed size')
+
     conf.write_config_header('gtk2ardour-config.h', remove=False)
 
     bak = conf.env['define_key']
@@ -767,16 +801,14 @@ def build(bld):
             )
         obj.install_path = bld.env['CONFDIR']
         
-    # not modified at present
-    bld.install_files(bld.env['CONFDIR'], 'dark.colors')
-
     # Icons/Images
     bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png'))
-    bld.install_files(os.path.join (bld.env['DATADIR'], 'pixmaps'), bld.path.ant_glob('pixmaps/*.xpm'))
-    bld.install_files(bld.env['DATADIR'], 'splash.png')
-    bld.install_files(bld.env['DATADIR'], 'small-splash.png')
     bld.install_files(bld.env['DATADIR'], 'ArdourMono.ttf')
 
+    # Application/Product specific resources (icon, splash)
+    pgmname = Options.options.program_name;
+    bld.install_files(os.path.join(bld.env['DATADIR'], 'resources'), bld.path.ant_glob('resources/' + pgmname + '*'))
+
     if bld.env['build_target'] == 'mingw':
         # These icons need to overwrite the files already installed in the icons
         # directory above. Do this in the external packaging scripts for now.
@@ -785,8 +817,9 @@ def build(bld):
 
     # Default UI configuration
     bld.install_files(bld.env['CONFDIR'], 'default_ui_config')
-    # Color Themes
-    bld.install_files(bld.env['CONFDIR'], 'dark.colors')
+    # Color Themes. Find each color file for this program only
+    # and install
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'themes'), bld.path.ant_glob ('themes/*-' + Options.options.program_name.lower() + '.colors'));
 
     # Default export stuff
     bld.install_files(os.path.join(bld.env['CONFDIR'], 'export'), bld.path.ant_glob('export/*.format'))
@@ -826,7 +859,7 @@ def i18n_mo(bld):
 def appdata_i18n_pot(bld):
     potfile = os.path.join(bld.top_dir, 'gtk2_ardour', 'appdata',
             'ardour.appdata.pot')
-    if bld.cmd == 'build':
+    if bld.cmd == 'i18n_pot':
         Logs.info('Generating pot file from Ardour appdata')
         itsfile = os.path.join(bld.top_dir, 'tools', 'as-metainfo.its')
         adsource = os.path.join(bld.top_dir, 'gtk2_ardour',