Merge master.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index 20e2e7c43640814bae85b1582577c35ab2c42e2e..bb530989452cee3e6558a322f85cafb83197bde6 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -38,6 +38,7 @@ sources = """
           server_dialog.cc
           servers_list_dialog.cc
           subtitle_panel.cc
+          subtitle_view.cc
           table_dialog.cc
           timecode.cc
           timeline.cc
@@ -63,7 +64,7 @@ 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:
+        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')
@@ -71,8 +72,8 @@ def configure(conf):
     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: