X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=d7a13e32ba7e6df3d28190d7e23c8346d2a48c12;hb=75f6cc0fa8bcff9b98a31200e313d8895cfaa3f8;hp=2685ba8b4c13ec9db48f69260a11e34492a677f0;hpb=b24104d631b8c6f44d95f28e2ff3bc608cb221a7;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 2685ba8b4..d7a13e32b 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -40,6 +40,7 @@ sources = """
           config_dialog.cc
           config_move_dialog.cc
           confirm_kdm_email_dialog.cc
+          content_advanced_dialog.cc
           content_colour_conversion_dialog.cc
           content_menu.cc
           content_panel.cc
@@ -49,23 +50,28 @@ sources = """
           controls.cc
           closed_captions_dialog.cc
           credentials_download_certificate_panel.cc
+          custom_scale_dialog.cc
           dcp_panel.cc
           dcpomatic_button.cc
+          disk_warning_dialog.cc
+          dkdm_output_panel.cc
+          drive_wipe_warning_dialog.cc
           email_dialog.cc
           image_sequence_dialog.cc
           isdcf_metadata_dialog.cc
           dcp_text_track_dialog.cc
           dir_picker_ctrl.cc
+          dkdm_dialog.cc
           dolby_doremi_certificate_panel.cc
           download_certificate_dialog.cc
           download_certificate_panel.cc
-          export_dialog.cc
+          export_subtitles_dialog.cc
+          export_video_file_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
           full_config_dialog.cc
@@ -85,7 +91,6 @@ sources = """
           kdm_dialog.cc
           kdm_output_panel.cc
           kdm_timing_panel.cc
-          key_dialog.cc
           make_chain_dialog.cc
           markers_dialog.cc
           message_dialog.cc
@@ -100,6 +105,7 @@ sources = """
           password_entry.cc
           player_config_dialog.cc
           player_information.cc
+          player_stress_tester.cc
           playhead_to_timecode_dialog.cc
           playhead_to_frame_dialog.cc
           playlist_controls.cc
@@ -107,6 +113,8 @@ sources = """
           question_dialog.cc
           rating_dialog.cc
           qube_certificate_panel.cc
+          recipients_panel.cc
+          recipient_dialog.cc
           recreate_chain_dialog.cc
           repeat_dialog.cc
           report_problem_dialog.cc
@@ -145,6 +153,7 @@ sources = """
           timeline_video_content_view.cc
           timeline_view.cc
           timing_panel.cc
+          try_unmount_dialog.cc
           update_dialog.cc
           verify_dcp_dialog.cc
           video_panel.cc
@@ -157,7 +166,7 @@ sources = """
 
 def configure(conf):
 
-    wx_libs = 'core,richtext,adv,html,xml'
+    wx_libs = 'core,richtext,adv,html,xml,propgrid'
 
     try:
         wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
@@ -191,7 +200,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES'])
 
     if conf.options.static_wxwidgets:
-	# wx-config returns its static libraries as full paths, without -l prefixes, which confuses
+        # wx-config returns its static libraries as full paths, without -l prefixes, which confuses
         # check_cfg().  It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out.
         stlibs = []
         new_linkflags = []
@@ -211,10 +220,14 @@ def configure(conf):
 
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='wxwidgets', path=wx_config, args='--version').strip()
-    conf.im_msg = 0
+    conf.in_msg = 0
     if not wx_version.startswith('3.0.'):
         conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
 
+    config = conf.check_cfg(package='wxwidgets', path=wx_config, args='--selected-config').strip()
+    if config.find('gtk2') != -1:
+        conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+
     try:
         conf.check_cfg(msg='Checking for RtAudio using pkg-config',
                        package='rtaudio',