Try to fix libglu link.
authorCarl Hetherington <cth@carlh.net>
Sun, 3 Mar 2019 16:51:15 +0000 (16:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 6 May 2019 20:31:09 +0000 (21:31 +0100)
src/wx/wscript

index 7b3882c39f7ef29b85eb4e3d5781026ba3e6b92e..1e83bb5768a0f89a8ca133b84ad27347e06e6d46 100644 (file)
@@ -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: