diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-09 11:47:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-09 11:47:38 +0100 |
| commit | 661245c262558da01b6c587b94bc975d9f78e8e1 (patch) | |
| tree | e7d5d0287bbb779e31f19ed9c10c1df5c86eb592 | |
| parent | 3316bdc92365f6469f4df865ab661d15c292c641 (diff) | |
Try to fix build on Fedora 28.
| -rw-r--r-- | src/wx/wscript | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 77076c23e..b5210bace 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -126,21 +126,30 @@ sources = """ def configure(conf): try: - wx_config = 'wx-config-3.0-gtk2' - conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2', + 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', uselib_store='WXWIDGETS', mandatory=True) except: - wx_config = 'wx-config' - conf.check_cfg(msg='Checking for wxWidgets using wx-config', - package='', - path=wx_config, - args='--cppflags --cxxflags --libs std,richtext', - uselib_store='WXWIDGETS', - mandatory=True) + try: + wx_config = 'wx-config-3.0-gtk2' + conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2', + package='', + path=wx_config, + args='--cppflags --cxxflags --libs std,richtext', + uselib_store='WXWIDGETS', + mandatory=True) + except: + wx_config = 'wx-config' + conf.check_cfg(msg='Checking for wxWidgets using wx-config', + package='', + path=wx_config, + args='--cppflags --cxxflags --libs std,richtext', + uselib_store='WXWIDGETS', + mandatory=True) if conf.options.static_wxwidgets: # wx-config returns its static libraries as full paths, without -l prefixes, which confuses |