diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-01 22:16:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-04 10:48:59 +0100 |
| commit | c39b290f02f49b68a3eb928fe1109cc7f6bf59eb (patch) | |
| tree | a6351ae29a9d070689fcee8f3a736a22193d9141 /src | |
| parent | a46d7383cf217c22a93b6cb7b94fb1d23913aff6 (diff) | |
Support for arm64 macOS builds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/wscript | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 989135587..bd428c81b 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -172,31 +172,40 @@ def configure(conf): wx_libs = 'core,richtext,adv,html,xml,propgrid' - try: - wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0' - conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0', + if conf.options.wx_config is not None: + wx_config = conf.options.wx_config + conf.check_cfg(msg='Checking for wxWidgets using %s' % wx_config, package='', path=wx_config, args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) - except: + else: 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 %s --gl-libs' % wx_libs, 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 %s --gl-libs' % wx_libs, - 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 %s --gl-libs' % wx_libs, + 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 %s --gl-libs' % wx_libs, + uselib_store='WXWIDGETS', + mandatory=True) if conf.env.TARGET_LINUX: conf.env.append_value('CXXFLAGS', ['-DGLX_GLXEXT_PROTOTYPES']) |