X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=47c9d1b3e33d2ae2644bacf321929f3182a6b8ac;hb=183b5597f73b85c0d6d29db8f6ed519386d07aa9;hp=ad0292a47988c1f3c2c5af9356f243044d5d4a5b;hpb=cb82f3c177b53ce99c8443a74da316a94ae829ac;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index ad0292a47..47c9d1b3e 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -33,9 +33,7 @@ sources = """
           audio_plot.cc
           barco_alchemy_certificate_panel.cc
           batch_job_view.cc
-          subtitle_appearance_dialog.cc
-          text_panel.cc
-          text_view.cc
+          check_box.cc
           christie_certificate_panel.cc
           cinema_dialog.cc
           colour_conversion_editor.cc
@@ -47,9 +45,11 @@ 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
@@ -67,12 +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
@@ -84,6 +86,7 @@ sources = """
           key_dialog.cc
           make_chain_dialog.cc
           message_dialog.cc
+          monitor_dialog.cc
           move_to_dialog.cc
           nag_dialog.cc
           name_format_editor.cc
@@ -104,11 +107,17 @@ 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
           system_font_dialog.cc
           table_dialog.cc
           templates_dialog.cc
+          text_panel.cc
+          text_view.cc
           time_picker.cc
           timecode.cc
           timeline.cc
@@ -133,12 +142,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:
@@ -147,7 +159,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:
@@ -155,7 +167,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)
 
@@ -217,8 +229,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)
@@ -241,7 +252,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)