Commit 3f04c31c authored by Emil Velikov's avatar Emil Velikov Committed by Juan Suárez Romero

glx/test: meson: assorted include fixes

Swap '..' with the symbolic inc_glx and add glproto as dependency. That
will pull the correct include, effectively fixing the tests on macOS.

Fixes: a47c525f ("meson: build glx")
Signed-off-by: 's avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker's avatarDylan Baker <dylan@pnwbakers.com>
(cherry picked from commit f331419f)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan Suárez Romero's avatarJuan A. Suarez Romero <jasuarez@igalia.com>

Conflicts:
	src/glx/tests/meson.build
parent 3de8d15d
......@@ -46,9 +46,9 @@ if with_shared_glapi
link_with : [libglx, libglapi],
include_directories : [
inc_src, inc_include, inc_mesa, inc_mapi, inc_gl_internal,
include_directories('..'),
inc_glx,
],
dependencies : [dep_libdrm, dep_thread, idep_gtest]
dependencies : [dep_libdrm, dep_glproto, dep_thread, idep_gtest]
)
)
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment