diff --git a/src/GL/meson.build b/src/GL/meson.build index eb0209d..41a2a79 100644 --- a/src/GL/meson.build +++ b/src/GL/meson.build @@ -28,7 +28,7 @@ libGL = shared_library( include_directories : [inc_include], link_args : '-Wl,-Bsymbolic', dependencies : [ - dep_dl, idep_gldispatch, idep_glapi_gl, idep_glx, idep_utils_misc, dep_x11_headers + dep_dl, idep_gldispatch, idep_glapi_gl, dep_glx, idep_utils_misc, dep_x11_headers ], version : '1.7.0', gnu_symbol_visibility : 'hidden', diff --git a/src/GLX/meson.build b/src/GLX/meson.build index 933a5ca..d0e93bb 100644 --- a/src/GLX/meson.build +++ b/src/GLX/meson.build @@ -53,13 +53,13 @@ libGLX = shared_library( inc_glx = include_directories('.') -idep_glx = declare_dependency( +dep_glx = declare_dependency( link_with : libGLX, include_directories : [inc_include, inc_glx], ) if meson.version().version_compare('>= 0.54') - meson.override_dependency('glx', idep_glx) + meson.override_dependency('glx', dep_glx) endif pkg.generate( diff --git a/tests/meson.build b/tests/meson.build index d6d8abc..f49c2ad 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -75,7 +75,7 @@ if with_glx ['testglxcreatecontext.c', 'test_utils.c'], include_directories : [inc_include], link_with : libOpenGL, - dependencies : [idep_glx, dep_x11], + dependencies : [dep_glx, dep_x11], ), env : env_glx, suite : ['glx'], @@ -89,7 +89,7 @@ if with_glx link_with : [libOpenGL], dependencies : [ dep_dl, dep_x11, idep_glvnd_pthread, idep_trace, idep_utils_misc, - idep_glx, + dep_glx, ], ) @@ -128,7 +128,7 @@ if with_glx 'glxgetprocaddress', ['testglxgetprocaddress.c'], include_directories : [inc_include], - dependencies : [dep_x11, idep_glx, idep_gldispatch], + dependencies : [dep_x11, dep_glx, idep_gldispatch], ) test( @@ -153,7 +153,7 @@ if with_glx 'testglxgetprocaddress_genentry', ['testglxgetprocaddress_genentry.c'], include_directories : [inc_include], - dependencies : [dep_x11, idep_glx], + dependencies : [dep_x11, dep_glx], ), env : env_glx, suite : ['glx'], @@ -167,7 +167,7 @@ if with_glx ['testglxgetclientstr.c'], include_directories : [inc_include], link_with : libOpenGL, - dependencies : [dep_x11, idep_glx, idep_trace, idep_utils_misc], + dependencies : [dep_x11, dep_glx, idep_trace, idep_utils_misc], ), env : env_glx, suite : ['glx'], @@ -181,7 +181,7 @@ if with_glx ['testglxqueryversion.c'], include_directories : [inc_include], link_with : libOpenGL, - dependencies : [dep_x11, idep_glx], + dependencies : [dep_x11, dep_glx], ), env : env_glx, suite : ['glx'],