Merge branch 'master' into plot-audio

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index b4a6092a66b423d27cdb0f27245b3594e331fb58..3fa40f55a7f811d74e1bf1186d99d3ee0a53288a 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -1,8 +1,5 @@
 def configure(conf):
-    if bld.env.TARGET_WINDOWS:
-        conf.check_cfg(package = '', atleast_version = '2.9.4', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
-    else:
-        conf.check_cfg(package = '', atleast_version = '2.8.12', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
+    conf.check_cfg(package = '', path = conf.options.wx_config, args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
 
 def build(bld):
     if bld.env.STATIC:
@@ -16,8 +13,10 @@ def build(bld):
     obj.uselib = 'WXWIDGETS'
     obj.use = 'libdvdomatic'
     obj.source = """
+                 audio_dialog.cc
+                 audio_plot.cc
                  config_dialog.cc
-                 dci_name_dialog.cc
+                 dci_metadata_dialog.cc
                  dir_picker_ctrl.cc
                  film_editor.cc
                  film_viewer.cc