From 1a01ead2985d52ff57303574afc8bdd27c7a36af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 3 Mar 2019 16:51:15 +0000 Subject: Try to fix libglu link. --- src/wx/wscript | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/wx/wscript b/src/wx/wscript index 7b3882c39..1e83bb576 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -178,8 +178,6 @@ def configure(conf): uselib_store='WXWIDGETS', mandatory=True) - conf.env.LIB_WXWIDGETS.append('GLU') - if conf.options.static_wxwidgets: # wx-config returns its static libraries as full paths, without -l prefixes, which confuses # check_cfg(). It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out. @@ -247,6 +245,7 @@ def configure(conf): define_name='DCPOMATIC_USE_RTERROR', mandatory=False) + conf.check_cfg(package='glu', args='--cflags --libs', uselib_store='GLU', mandatory=True) def build(bld): @@ -257,7 +256,7 @@ def build(bld): obj.name = 'libdcpomatic2-wx' obj.export_includes = ['..'] - obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO ' + obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO GLU ' if bld.env.TARGET_LINUX: obj.uselib += 'GTK ' if bld.env.TARGET_WINDOWS: -- cgit v1.2.3