X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fwscript;h=8bf2451c22cba584271a648c7037a7d2b909a0ca;hb=888eedd469b461cd51a384518e075dbee9f6834f;hp=2fa37216b33fed605d688e57a891bf9179642484;hpb=5dc5a43bf61847cf863b29ef47d0046a9d4fdef0;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 2fa37216b..8bf2451c2 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -15,7 +15,7 @@ sources = """
           config_dialog.cc
           content_colour_conversion_dialog.cc
           content_menu.cc
-          dci_metadata_dialog.cc
+          isdcf_metadata_dialog.cc
           dir_picker_ctrl.cc
           dolby_certificate_dialog.cc
           doremi_certificate_dialog.cc
@@ -38,6 +38,7 @@ sources = """
           server_dialog.cc
           servers_list_dialog.cc
           subtitle_panel.cc
+          table_dialog.cc
           timecode.cc
           timeline.cc
           timeline_dialog.cc
@@ -62,12 +63,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: