Merge.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index 96a0c48693df3105ac63d64ba670c63a4b73216a..b78ccc9282adb546ecd4f2e06833941263de4f03 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -39,21 +39,29 @@ sources = """
           content_properties_dialog.cc
           content_sub_panel.cc
           dcp_panel.cc
+          email_dialog.cc
           image_sequence_dialog.cc
           isdcf_metadata_dialog.cc
           dir_picker_ctrl.cc
-          dolby_certificate_dialog.cc
-          doremi_certificate_dialog.cc
+          dolby_doremi_certificate_panel.cc
           download_certificate_dialog.cc
+          download_certificate_panel.cc
+          file_picker_ctrl.cc
           film_editor.cc
           film_viewer.cc
           filter_dialog.cc
           filter_editor.cc
           fonts_dialog.cc
+          font_files_dialog.cc
           gain_calculator_dialog.cc
           hints_dialog.cc
+          job_view.cc
+          job_view_dialog.cc
           job_manager_view.cc
+          kdm_cpl_panel.cc
           kdm_dialog.cc
+          kdm_output_panel.cc
+          kdm_timing_panel.cc
           key_dialog.cc
           make_chain_dialog.cc
           new_film_dialog.cc
@@ -61,10 +69,14 @@ sources = """
           repeat_dialog.cc
           report_problem_dialog.cc
           screen_dialog.cc
+          screens_panel.cc
+          self_dkdm_dialog.cc
           server_dialog.cc
           servers_list_dialog.cc
+          subtitle_appearance_dialog.cc
           subtitle_panel.cc
           subtitle_view.cc
+          system_font_dialog.cc
           table_dialog.cc
           timecode.cc
           timeline.cc
@@ -72,23 +84,36 @@ sources = """
           timeline_dialog.cc
           timeline_audio_content_view.cc
           timeline_subtitle_content_view.cc
+          timeline_reels_view.cc
           timeline_time_axis_view.cc
           timeline_video_content_view.cc
           timeline_view.cc
           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 using wx-config-3.0-gtk2',
+                       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 using wx-config',
+                       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
@@ -110,7 +135,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)