[Piglit] [PATCH 1/2] util/gl: link against OPENGL_gl_LIBRARY on waffle-less systems

Emil Velikov emil.l.velikov at gmail.com
Sat Nov 22 14:26:39 PST 2014


Currently Windows builds statically link against piglitutil &
piglitutil_gl, with the opengl32.dll dependency present in the
executable link list.

As we move to a standalone dll(s) similar to linux, with follow-up
commits, building piglitutil_gl fails as it lacks OPENGL_gl_LIBRARY
required by the gl dispatch as shown below.

(piglit-dispatch-init.c.obj): In function `get_ext_proc_address':
piglit-dispatch-init.c:84: undefined reference to `__imp_wglGetProcAddress'

On Linux we were rather fortunate (apart from using waffle by default),
as the ld is smart enough to load libglut, which explicitly pulls libGL,
thus glXGetProcAddress{,ARB} ends up resolved.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 tests/util/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 98eedd0..a6ae6dd 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -87,6 +87,10 @@ else()
 	list(APPEND UTIL_GL_SOURCES
 		piglit-framework-gl/piglit_glut_framework.c
 	)
+
+	list(APPEND UTIL_GL_LIBS
+		${OPENGL_gl_LIBRARY}
+	)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-- 
2.1.3



More information about the Piglit mailing list