Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index 370f59c621d5d3ff8ddf4f3c27db2921a2be50a6..34a7608dfdbfa159371a15fb4565dbe6315cb342 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -55,10 +55,9 @@ sources = """
           job_manager_view.cc
           kdm_dialog.cc
           key_dialog.cc
-          make_signer_chain_dialog.cc
+          make_chain_dialog.cc
           new_film_dialog.cc
           preset_colour_conversion_dialog.cc
-          properties_dialog.cc
           repeat_dialog.cc
           report_problem_dialog.cc
           screen_dialog.cc
@@ -66,6 +65,7 @@ sources = """
           servers_list_dialog.cc
           subtitle_panel.cc
           subtitle_view.cc
+          system_font_dialog.cc
           table_dialog.cc
           timecode.cc
           timeline.cc
@@ -79,6 +79,8 @@ sources = """
           timing_panel.cc
           update_dialog.cc
           video_panel.cc
+          video_waveform_dialog.cc
+          video_waveform_plot.cc
           wx_util.cc
           wx_signal_manager.cc
           """
@@ -105,11 +107,11 @@ def configure(conf):
                 stlibs.append(os.path.basename(f)[3:-2])
             else:
                 new_linkflags.append(f)
-        
+
         conf.env.STLIB_WXWIDGETS = stlibs
         conf.env.LINKFLAGS_WXWIDGETS = new_linkflags
         conf.env.STLIBPATH_WXWIDGETS = stlib_paths
- 
+
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path='wx-config', args='--version').strip()
     conf.im_msg = 0
@@ -124,7 +126,7 @@ def build(bld):
 
     obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD WXWIDGETS DCP SUB ZIP '
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP '
     if bld.env.TARGET_LINUX:
         obj.uselib += 'GTK '
     if bld.env.TARGET_WINDOWS: