Rename Subtitle -> Text

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index cb7e98d7082f9a66cae2ffa6e5f70247f215994b..d5adafebe44e45f0dff55310ac19d516237913db 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -57,6 +57,7 @@ sources = """
           film_viewer.cc
           filter_dialog.cc
           filter_editor.cc
+          focus_manager.cc
           fonts_dialog.cc
           font_files_dialog.cc
           full_config_dialog.cc
@@ -65,6 +66,7 @@ sources = """
           job_view.cc
           job_view_dialog.cc
           job_manager_view.cc
+          kdm_advanced_dialog.cc
           kdm_cpl_panel.cc
           kdm_dialog.cc
           kdm_output_panel.cc
@@ -76,11 +78,13 @@ sources = """
           name_format_editor.cc
           new_dkdm_folder_dialog.cc
           normal_job_view.cc
+          paste_dialog.cc
           player_config_dialog.cc
           player_information.cc
           playhead_to_timecode_dialog.cc
           playhead_to_frame_dialog.cc
           question_dialog.cc
+          recreate_chain_dialog.cc
           repeat_dialog.cc
           report_problem_dialog.cc
           rename_template_dialog.cc
@@ -105,13 +109,14 @@ sources = """
           timeline_dialog.cc
           timeline_audio_content_view.cc
           timeline_labels_view.cc
-          timeline_subtitle_content_view.cc
+          timeline_text_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
+          verify_dcp_dialog.cc
           video_panel.cc
           video_waveform_dialog.cc
           video_waveform_plot.cc
@@ -121,21 +126,30 @@ sources = """
 
 def configure(conf):
     try:
-        wx_config = 'wx-config-3.0-gtk2'
-        conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
+        wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
+        conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0',
                        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)
+        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
@@ -159,8 +173,8 @@ def configure(conf):
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path=wx_config, args='--version').strip()
     conf.im_msg = 0
-    if not wx_version.startswith('3.'):
-        conf.fatal('wxwidgets version 3.x.y is required; %s found' % wx_version)
+    if not wx_version.startswith('3.0.'):
+        conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
 
     try:
         conf.check_cfg(msg='Checking for RtAudio using pkg-config',