X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=dee54e0383ccc85b88419f366ea3b1c3f315096d;hp=22d9f0db6a18938d045c6446feaa6f121a5630c8;hb=44da1840ca17d0945cb1886bb17218990850894c;hpb=47e29203daec51d313ed8ab8ef759752bce18d45

diff --git a/src/wx/wscript b/src/wx/wscript
index 22d9f0db6..dee54e038 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -40,15 +40,18 @@ 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
           content_properties_dialog.cc
           content_sub_panel.cc
+          content_version_dialog.cc
           content_view.cc
           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
@@ -63,13 +66,13 @@ sources = """
           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
@@ -78,8 +81,8 @@ sources = """
           gl_video_view.cc
           hints_dialog.cc
           html_dialog.cc
-          initial_setup_dialog.cc
           instant_i18n_dialog.cc
+          interop_metadata_dialog.cc
           i18n_hook.cc
           job_view.cc
           job_view_dialog.cc
@@ -89,11 +92,11 @@ sources = """
           kdm_dialog.cc
           kdm_output_panel.cc
           kdm_timing_panel.cc
-          key_dialog.cc
+          language_tag_dialog.cc
+          language_tag_widget.cc
           make_chain_dialog.cc
           markers_dialog.cc
           message_dialog.cc
-          metadata_dialog.cc
           monitor_dialog.cc
           move_to_dialog.cc
           nag_dialog.cc
@@ -127,6 +130,7 @@ sources = """
           server_dialog.cc
           servers_list_dialog.cc
           simple_video_view.cc
+          smpte_metadata_dialog.cc
           standard_controls.cc
           static_text.cc
           subtitle_appearance_dialog.cc
@@ -165,7 +169,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'
@@ -199,7 +203,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 = []
@@ -219,9 +223,13 @@ def configure(conf):
 
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='wxwidgets', 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)
+    conf.in_msg = 0
+    if not wx_version.startswith('3.'):
+        conf.fatal('wxwidgets version 3.x.y 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',
@@ -255,16 +263,6 @@ def configure(conf):
         conf.env.LIB_RTAUDIO.append('mfuuid')
         conf.env.LIB_RTAUDIO.append('wmcodecdspuuid')
 
-    conf.check_cxx(fragment="""
-                            #include <RtAudio.h>\n
-                            int main() { throw RtError("Hello"); }
-			    """,
-                   msg='Checking for RtError class',
-                   use='RTAUDIO',
-                   uselib_store='',
-                   define_name='DCPOMATIC_USE_RTERROR',
-                   mandatory=False)
-
     if conf.env.TARGET_WINDOWS or conf.env.TARGET_LINUX:
         conf.check_cfg(package='gl', args='--cflags --libs', uselib_store='GL', mandatory=True)
         conf.check_cfg(package='glu', args='--cflags --libs', uselib_store='GLU', mandatory=True)