From: Carl Hetherington <cth@carlh.net>
Date: Thu, 28 Nov 2013 23:20:32 +0000 (+0000)
Subject: Merge branch '1.0' into 1.0-generated-control
X-Git-Tag: v2.0.48~1108^2
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=747fc9e02cb66fb965e23a4cc0464cf7e8bd743d;hp=d5382fd7db3ba0f2ad75ab5879de1b33ac65751c;p=dcpomatic.git

Merge branch '1.0' into 1.0-generated-control
---

diff --git a/src/wx/wscript b/src/wx/wscript
index 084e5cc68..34047f3ac 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -54,15 +54,15 @@ def configure(conf):
     if conf.env.STATIC:
 	# wx-config returns its static libraries as full paths, without -l prefixes, which confuses
         # check_cfg(), so just hard-code it all.
-        conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-2.9', 'wx_gtk2u_xrc-2.9', 'wx_gtk2u_qa-2.9', 'wx_baseu_net-2.9', 'wx_gtk2u_html-2.9',
-                                    'wx_gtk2u_adv-2.9', 'wx_gtk2u_core-2.9', 'wx_baseu_xml-2.9', 'wx_baseu-2.9']
+        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']
  
     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 != '2.9.4' and wx_version != '2.9.5':
-        conf.fatal('wxwidgets version 2.9.4 or 2.9.5 is required; %s found' % wx_version)
+    if wx_version != '3.0.0':
+        conf.fatal('wxwidgets version 3.0.0 is required; %s found' % wx_version)
 
 def build(bld):
     if bld.env.STATIC: