Merge master.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index cd78f064920081a7bbee364035af9f3f2e0c753b..719496ae702a9d190aaea309a5d76e912ca8443a 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -15,13 +15,14 @@ sources = """
           config_dialog.cc
           content_colour_conversion_dialog.cc
           content_menu.cc
-          dci_metadata_dialog.cc
+          content_panel.cc
+          content_sub_panel.cc
+          isdcf_metadata_dialog.cc
           dir_picker_ctrl.cc
           dolby_certificate_dialog.cc
           doremi_certificate_dialog.cc
           download_certificate_dialog.cc
           film_editor.cc
-          film_editor_panel.cc
           film_viewer.cc
           filter_dialog.cc
           filter_editor.cc
@@ -64,12 +65,19 @@ def configure(conf):
         conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0',
                                     'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0']
         conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
+        if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE:
+            conf.env.LIB_WXWIDGETS.append('Xxf86vm')
+            conf.env.LIB_WXWIDGETS.append('Xext')
+            conf.env.LIB_WXWIDGETS.append('X11')
+
+        if conf.env.TARGET_CENTOS_7:
+            conf.env.LIB_WXWIDGETS.append('Xxf86vm')
  
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
     conf.im_msg = 0
-    if wx_version != '3.0.0':
-        conf.fatal('wxwidgets version 3.0.0 is required; %s found' % wx_version)
+    if not wx_version.startswith('3.0.'):
+        conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
 
 def build(bld):
     if bld.env.BUILD_STATIC: