diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-10-25 20:21:23 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-10-26 11:21:29 +0100 |
| commit | 8a743225a7e34bbadba63795076204204aac551a (patch) | |
| tree | 5806059f3cf32c42511eec0f47a8a4f05ef683fa /src/wx/wscript | |
| parent | ed7986e9f0975ca26ac0ba72caaaedda482fe5e7 (diff) | |
Allow building and running with wxWidgets 3.1.x as well as 3.0.x.
Diffstat (limited to 'src/wx/wscript')
| -rw-r--r-- | src/wx/wscript | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 99720c109..2c2820e33 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -194,8 +194,12 @@ def configure(conf): conf.in_msg = 1 wx_version = conf.check_cfg(package='wxwidgets', path=wx_config, args='--version').strip() conf.im_msg = 0 - if not wx_version.startswith('3.0.'): - conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version) + if not wx_version.startswith('3.'): + conf.fatal('wxwidgets version 3.x.y is required; %s found' % wx_version) + + config = conf.check_cfg(package='wxwidgets', path=wx_config, args='--selected-config').strip() + if config.find('gtk2') != -1: + conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) try: conf.check_cfg(msg='Checking for RtAudio using pkg-config', |