From ac3fecc5bd3eaf279c668e331f6f92a02a2d41d3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Jan 2019 16:40:09 +0000 Subject: [PATCH] Fix Centos build after changes to container. --- src/wx/wscript | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/wx/wscript b/src/wx/wscript index 7221316d3..74d4d8bce 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -122,12 +122,15 @@ sources = """ """ def configure(conf): + + wx_libs = 'core,richtext,adv,html,xml' + try: wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0' conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0', package='', path=wx_config, - args='--cppflags --cxxflags --libs std,richtext', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -136,7 +139,7 @@ def configure(conf): conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2', package='', path=wx_config, - args='--cppflags --cxxflags --libs std,richtext', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -144,7 +147,7 @@ def configure(conf): conf.check_cfg(msg='Checking for wxWidgets using wx-config', package='', path=wx_config, - args='--cppflags --cxxflags --libs std,richtext', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) -- 2.30.2