From cf99189cba48768308da83cdc544da22f19f3e0d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 15 Jan 2019 12:57:37 +0000 Subject: Restore some required wxwidgets bits. --- src/wx/wscript | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/wx/wscript') diff --git a/src/wx/wscript b/src/wx/wscript index 4ddafc648..1b29b057b 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -142,12 +142,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 core,richtext,adv', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -156,7 +159,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 core,richtext,adv', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -164,7 +167,7 @@ def configure(conf): conf.check_cfg(msg='Checking for wxWidgets using wx-config', package='', path=wx_config, - args='--cppflags --cxxflags --libs core,richtext,adv', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) -- cgit v1.2.3