Merge branch 'master' into plot-audio

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index d425c3e05a31ead28d652efc8d8c2bfea724a0e6..3fa40f55a7f811d74e1bf1186d99d3ee0a53288a 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -1,16 +1,22 @@
 def configure(conf):
-    conf.check_cfg(package = '', 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):
-    obj = bld(features = 'cxx cxxshlib')
+    if bld.env.STATIC:
+        obj = bld(features = 'cxx cxxstlib')
+    else:
+        obj = bld(features = 'cxx cxxshlib')
+
     obj.name   = 'libdvdomatic-wx'
     obj.includes = [ '..' ]
     obj.export_includes = ['.']
     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