projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e67ff2
)
We must only link gtk2 if wx is also using it.
author
Carl Hetherington
<cth@carlh.net>
Thu, 21 May 2020 22:26:53 +0000
(
00:26
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 21 May 2020 22:26:53 +0000
(
00:26
+0200)
src/wx/wscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/src/wx/wscript
b/src/wx/wscript
index 83e2022b3bb9728a61f2c2f48edeef71d7d7a303..339ebb1ec8f0dab45fe26646c3ea2660917a4754 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-225,6
+225,10
@@
def configure(conf):
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.0.'):
conf.fatal('wxwidgets version 3.0.x 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',
package='rtaudio',
try:
conf.check_cfg(msg='Checking for RtAudio using pkg-config',
package='rtaudio',
diff --git
a/wscript
b/wscript
index 86c65ad74da8f49aae7321d3d45694f879c1f8d1..f49b491082ce3c90cb2b6d5a9c7e3cc28a39b9be 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-199,8
+199,6
@@
def configure(conf):
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
- if not conf.env.DISABLE_GUI:
- conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
# OSX
if conf.env.TARGET_OSX:
# OSX
if conf.env.TARGET_OSX: