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

diff --git a/src/wx/wscript b/src/wx/wscript
index d7a13e32b..dee54e038 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -46,6 +46,7 @@ sources = """
           content_panel.cc
           content_properties_dialog.cc
           content_sub_panel.cc
+          content_version_dialog.cc
           content_view.cc
           controls.cc
           closed_captions_dialog.cc
@@ -80,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
@@ -91,10 +92,11 @@ sources = """
           kdm_dialog.cc
           kdm_output_panel.cc
           kdm_timing_panel.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
@@ -128,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
@@ -221,8 +224,8 @@ def configure(conf):
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='wxwidgets', path=wx_config, args='--version').strip()
     conf.in_msg = 0
-    if not wx_version.startswith('3.0.'):
-        conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
+    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:
@@ -260,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)