X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=b868292f583e6db60fa20eb22ed2d1c05620b433;hb=2b3fbc42400258ae47ae3a10d3dfd9f0561d1940;hp=3f0ca2b979e1a32eacefa0df7d34bcff6c8bfd9b;hpb=b83e61259c0244d5618c5ed9dcc8602205580886;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 3f0ca2b97..b868292f5 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -36,6 +36,7 @@ sources = """
           check_box.cc
           christie_certificate_panel.cc
           cinema_dialog.cc
+          closed_captions_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc
           config_move_dialog.cc
@@ -49,23 +50,21 @@ sources = """
           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
-          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
+          dcpomatic_button.cc
+          dcpomatic_spin_ctrl.cc
           dir_picker_ctrl.cc
+          disk_warning_dialog.cc
           dkdm_dialog.cc
+          dkdm_output_panel.cc
           dolby_doremi_certificate_panel.cc
           download_certificate_dialog.cc
           download_certificate_panel.cc
+          drive_wipe_warning_dialog.cc
+          email_dialog.cc
           export_subtitles_dialog.cc
           export_video_file_dialog.cc
           file_picker_ctrl.cc
@@ -76,28 +75,30 @@ sources = """
           focus_manager.cc
           fonts_dialog.cc
           full_config_dialog.cc
+          full_language_tag_dialog.cc
           gain_calculator_dialog.cc
           gdc_certificate_panel.cc
           gl_video_view.cc
           hints_dialog.cc
           html_dialog.cc
-          initial_setup_dialog.cc
+          i18n_hook.cc
+          image_sequence_dialog.cc
           instant_i18n_dialog.cc
           interop_metadata_dialog.cc
-          i18n_hook.cc
+          job_manager_view.cc
           job_view.cc
           job_view_dialog.cc
-          job_manager_view.cc
           kdm_advanced_dialog.cc
           kdm_cpl_panel.cc
           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
-          monitor_dialog.cc
+          metadata_dialog.cc
           move_to_dialog.cc
           nag_dialog.cc
           name_format_editor.cc
@@ -159,6 +160,7 @@ sources = """
           try_unmount_dialog.cc
           update_dialog.cc
           verify_dcp_dialog.cc
+          verify_dcp_progress_dialog.cc
           video_panel.cc
           video_view.cc
           video_waveform_dialog.cc
@@ -171,31 +173,40 @@ def configure(conf):
 
     wx_libs = 'core,richtext,adv,html,xml,propgrid'
 
-    try:
-        wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
-        conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0',
+    if conf.options.wx_config is not None:
+        wx_config = conf.options.wx_config
+        conf.check_cfg(msg='Checking for wxWidgets using %s' % wx_config,
                        package='',
                        path=wx_config,
                        args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
                        uselib_store='WXWIDGETS',
                        mandatory=True)
-    except:
+    else:
         try:
-            wx_config = 'wx-config-3.0-gtk2'
-            conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
+            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 %s --gl-libs' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
         except:
-            wx_config = 'wx-config'
-            conf.check_cfg(msg='Checking for wxWidgets using wx-config',
-                           package='',
-                           path=wx_config,
-                           args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
-                           uselib_store='WXWIDGETS',
-                           mandatory=True)
+            try:
+                wx_config = 'wx-config-3.0-gtk2'
+                conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
+                               package='',
+                               path=wx_config,
+                               args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
+                               uselib_store='WXWIDGETS',
+                               mandatory=True)
+            except:
+                wx_config = 'wx-config'
+                conf.check_cfg(msg='Checking for wxWidgets using wx-config',
+                               package='',
+                               path=wx_config,
+                               args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
+                               uselib_store='WXWIDGETS',
+                               mandatory=True)
 
     if conf.env.TARGET_LINUX:
         conf.env.append_value('CXXFLAGS', ['-DGLX_GLXEXT_PROTOTYPES'])
@@ -304,10 +315,7 @@ def build(bld):
     if bld.env.TARGET_OSX:
         obj.framework = ['CoreAudio', 'OpenGL']
     obj.use = 'libdcpomatic2'
-    if not len(bld.env.VARIANT) == 0 and bld.env.VARIANT.startswith('swaroop-'):
-        obj.source = sources + " swaroop_controls.cc"
-    else:
-        obj.source = sources
+    obj.source = sources
     obj.target = 'dcpomatic2-wx'
 
     i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)