Split KDM output stuff into a separate panel.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index b828c771116cc43df9b70430ba003055edc698bb..576b9231dae3fd0926dda93a8d8544501b9f2636 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -54,18 +54,21 @@ sources = """
           hints_dialog.cc
           job_manager_view.cc
           kdm_dialog.cc
+          kdm_output_panel.cc
+          kdm_timing_panel.cc
           key_dialog.cc
-          make_signer_chain_dialog.cc
+          make_chain_dialog.cc
           new_film_dialog.cc
           preset_colour_conversion_dialog.cc
-          properties_dialog.cc
           repeat_dialog.cc
           report_problem_dialog.cc
           screen_dialog.cc
+          screens_panel.cc
           server_dialog.cc
           servers_list_dialog.cc
           subtitle_panel.cc
           subtitle_view.cc
+          system_font_dialog.cc
           table_dialog.cc
           timecode.cc
           timeline.cc
@@ -79,17 +82,29 @@ sources = """
           timing_panel.cc
           update_dialog.cc
           video_panel.cc
+          video_waveform_dialog.cc
+          video_waveform_plot.cc
           wx_util.cc
           wx_signal_manager.cc
           """
 
 def configure(conf):
-    conf.check_cfg(msg='Checking for wxWidgets',
-                   package='',
-                   path='wx-config',
-                   args='--cppflags --cxxflags --libs std,richtext',
-                   uselib_store='WXWIDGETS',
-                   mandatory=True)
+    try:
+        wx_config = 'wx-config-3.0-gtk2'
+        conf.check_cfg(msg='Checking for wxWidgets',
+                       package='',
+                       path=wx_config,
+                       args='--cppflags --cxxflags --libs std,richtext',
+                       uselib_store='WXWIDGETS',
+                       mandatory=True)
+    except:
+        wx_config = 'wx-config'
+        conf.check_cfg(msg='Checking for wxWidgets',
+                       package='',
+                       path=wx_config,
+                       args='--cppflags --cxxflags --libs std,richtext',
+                       uselib_store='WXWIDGETS',
+                       mandatory=True)
 
     if conf.options.static_wxwidgets:
        # wx-config returns its static libraries as full paths, without -l prefixes, which confuses
@@ -111,7 +126,7 @@ def configure(conf):
         conf.env.STLIBPATH_WXWIDGETS = stlib_paths
 
     conf.in_msg = 1
-    wx_version = conf.check_cfg(package='', path='wx-config', args='--version').strip()
+    wx_version = conf.check_cfg(package='', path=wx_config, args='--version').strip()
     conf.im_msg = 0
     if not wx_version.startswith('3.0.'):
         conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)