X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=358d98d70301ce40361af620a38921d922bb9766;hb=8b2a3f31b6b4238d8534549f495e7276174ddfba;hp=4eded300de54f3dfc865271a54e71a1cf833b71f;hpb=ff40ecd114547a2fc07bc49403c993c3fa5d40cc;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 4eded300d..358d98d70 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.
 #
@@ -31,8 +31,10 @@ sources = """
           audio_mapping_view.cc
           audio_panel.cc
           audio_plot.cc
+          barco_alchemy_certificate_panel.cc
           batch_job_view.cc
-          caption_panel.cc
+          check_box.cc
+          christie_certificate_panel.cc
           cinema_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc
@@ -43,10 +45,15 @@ sources = """
           content_panel.cc
           content_properties_dialog.cc
           content_sub_panel.cc
+          content_view.cc
+          controls.cc
+          closed_captions_dialog.cc
           dcp_panel.cc
+          dcpomatic_button.cc
           email_dialog.cc
           image_sequence_dialog.cc
           isdcf_metadata_dialog.cc
+          dcp_text_track_dialog.cc
           dir_picker_ctrl.cc
           dolby_doremi_certificate_panel.cc
           download_certificate_dialog.cc
@@ -63,7 +70,11 @@ sources = """
           font_files_dialog.cc
           full_config_dialog.cc
           gain_calculator_dialog.cc
+          gdc_certificate_panel.cc
           hints_dialog.cc
+          initial_setup_dialog.cc
+          instant_i18n_dialog.cc
+          i18n_hook.cc
           job_view.cc
           job_view_dialog.cc
           job_manager_view.cc
@@ -74,6 +85,8 @@ sources = """
           kdm_timing_panel.cc
           key_dialog.cc
           make_chain_dialog.cc
+          message_dialog.cc
+          monitor_dialog.cc
           move_to_dialog.cc
           nag_dialog.cc
           name_format_editor.cc
@@ -96,11 +109,15 @@ sources = """
           self_dkdm_dialog.cc
           server_dialog.cc
           servers_list_dialog.cc
+          standard_controls.cc
+          static_text.cc
           subtitle_appearance_dialog.cc
-          subtitle_view.cc
+          swaroop_controls.cc
           system_font_dialog.cc
           table_dialog.cc
           templates_dialog.cc
+          text_panel.cc
+          text_view.cc
           time_picker.cc
           timecode.cc
           timeline.cc
@@ -171,7 +188,7 @@ def configure(conf):
         conf.env.STLIBPATH_WXWIDGETS = stlib_paths
 
     conf.in_msg = 1
-    wx_version = conf.check_cfg(package='', path=wx_config, args='--version').strip()
+    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)
@@ -209,8 +226,7 @@ def configure(conf):
                             int main() { throw RtError("Hello"); }
 			    """,
                    msg='Checking for RtError class',
-                   libpath='/usr/local/lib',
-                   lib=['rtaudio'],
+                   use='RTAUDIO',
                    uselib_store='',
                    define_name='DCPOMATIC_USE_RTERROR',
                    mandatory=False)