Fix incorrect results when applying some timing operations to

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index ec75bd99cf65bc83c11dfe9b7a375966a16fde0f..99720c10912d2a511794c34ef9caea5f1be07a41 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -31,10 +31,10 @@ sources = """
           audio_mapping_view.cc
           audio_panel.cc
           audio_plot.cc
+          barco_alchemy_certificate_panel.cc
           batch_job_view.cc
-          caption_appearance_dialog.cc
-          caption_panel.cc
-          caption_view.cc
+          check_box.cc
+          christie_certificate_panel.cc
           cinema_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc
@@ -45,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
@@ -62,10 +67,14 @@ sources = """
           filter_editor.cc
           focus_manager.cc
           fonts_dialog.cc
-          font_files_dialog.cc
           full_config_dialog.cc
           gain_calculator_dialog.cc
+          gdc_certificate_panel.cc
           hints_dialog.cc
+          html_dialog.cc
+          initial_setup_dialog.cc
+          instant_i18n_dialog.cc
+          i18n_hook.cc
           job_view.cc
           job_view_dialog.cc
           job_manager_view.cc
@@ -76,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 +107,18 @@ sources = """
           screen_dialog.cc
           screens_panel.cc
           self_dkdm_dialog.cc
+          send_i18n_dialog.cc
           server_dialog.cc
           servers_list_dialog.cc
+          standard_controls.cc
+          static_text.cc
+          subtitle_appearance_dialog.cc
+          suspender.cc
           system_font_dialog.cc
           table_dialog.cc
           templates_dialog.cc
+          text_panel.cc
+          text_view.cc
           time_picker.cc
           timecode.cc
           timeline.cc
@@ -125,12 +143,15 @@ sources = """
           """
 
 def configure(conf):
+
+    wx_libs = 'core,richtext,adv,html,xml'
+
     try:
         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',
+                       args='--cppflags --cxxflags --libs %s' % wx_libs,
                        uselib_store='WXWIDGETS',
                        mandatory=True)
     except:
@@ -139,7 +160,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs std,richtext',
+                           args='--cppflags --cxxflags --libs %s' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
         except:
@@ -147,7 +168,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs std,richtext',
+                           args='--cppflags --cxxflags --libs %s' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
 
@@ -171,7 +192,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)
@@ -199,18 +220,21 @@ def configure(conf):
 
     # Some rtaudio-configs don't include rtaudio as a link library.  Go figure.
     conf.env.LIB_RTAUDIO.append('rtaudio')
-    # Don't explicitly link with pthread on Windows
     if conf.env.TARGET_WINDOWS:
+        # Don't explicitly link with pthread on Windows
         conf.env.CFLAGS_RTAUDIO.remove('-pthread')
         conf.env.LINKFLAGS_RTAUDIO.remove('-pthread')
+        # We need some libraries for WASAPI
+        conf.env.LIB_RTAUDIO.append('mfplat')
+        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',
-                   libpath='/usr/local/lib',
-                   lib=['rtaudio'],
+                   use='RTAUDIO',
                    uselib_store='',
                    define_name='DCPOMATIC_USE_RTERROR',
                    mandatory=False)
@@ -233,7 +257,10 @@ def build(bld):
     if bld.env.TARGET_OSX:
         obj.framework = ['CoreAudio']
     obj.use = 'libdcpomatic2'
-    obj.source = sources
+    if bld.env.VARIANT == 'swaroop':
+        obj.source = sources + " swaroop_controls.cc"
+    else:
+        obj.source = sources
     obj.target = 'dcpomatic2-wx'
 
     i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)