X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fwscript;h=0a32d1dfefcc527f2fdffcb4da6e257162972cb4;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hp=c545bf4828a4dbe152d44f4b3241862757c369b3;hpb=622380e6ae74614325324031a43988709420c558;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index c545bf482..0a32d1dfe 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -32,15 +32,20 @@ sources = """
           audio_panel.cc
           audio_plot.cc
           batch_job_view.cc
+          subtitle_appearance_dialog.cc
+          text_panel.cc
+          text_view.cc
           cinema_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc
+          config_move_dialog.cc
           confirm_kdm_email_dialog.cc
           content_colour_conversion_dialog.cc
           content_menu.cc
           content_panel.cc
           content_properties_dialog.cc
           content_sub_panel.cc
+          closed_captions_dialog.cc
           dcp_panel.cc
           email_dialog.cc
           image_sequence_dialog.cc
@@ -49,18 +54,23 @@ sources = """
           dolby_doremi_certificate_panel.cc
           download_certificate_dialog.cc
           download_certificate_panel.cc
+          export_dialog.cc
           file_picker_ctrl.cc
           film_editor.cc
+          film_name_location_dialog.cc
           film_viewer.cc
           filter_dialog.cc
           filter_editor.cc
+          focus_manager.cc
           fonts_dialog.cc
           font_files_dialog.cc
+          full_config_dialog.cc
           gain_calculator_dialog.cc
           hints_dialog.cc
           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
@@ -68,11 +78,17 @@ sources = """
           key_dialog.cc
           make_chain_dialog.cc
           move_to_dialog.cc
+          nag_dialog.cc
           name_format_editor.cc
-          new_film_dialog.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
@@ -83,9 +99,6 @@ sources = """
           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
           templates_dialog.cc
@@ -97,13 +110,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
@@ -113,21 +127,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