Merge branch 'tests-fix-missing-libs' into 'master'
tests: Fix some missing libraries See merge request glvnd/libglvnd!201
This commit is contained in:
commit
2d5d9d6c3a
|
@ -25,11 +25,13 @@ libGLX_dummy_la_SOURCES = \
|
|||
libGLX_dummy_la_LIBADD = $(top_builddir)/src/util/libtrace.la
|
||||
libGLX_dummy_la_LIBADD += $(top_builddir)/src/util/libutils_misc.la
|
||||
libGLX_dummy_la_LIBADD += libpatchentrypoints.la
|
||||
libGLX_dummy_la_LIBADD += $(X11_LIBS)
|
||||
# The -rpath option forces libtool to create a shared library instead of just a
|
||||
# static library.
|
||||
libGLX_dummy_la_LDFLAGS = \
|
||||
-shared \
|
||||
-rpath /nowhere
|
||||
-rpath /nowhere \
|
||||
$(LINKER_FLAG_NO_UNDEFINED)
|
||||
endif # ENABLE_GLX
|
||||
|
||||
if ENABLE_EGL
|
||||
|
@ -38,10 +40,13 @@ EGL_DUMMY_CFLAGS_COMMON = \
|
|||
-I$(top_srcdir)/include
|
||||
EGL_DUMMY_SOURCES_COMMON = EGL_dummy.c
|
||||
EGL_DUMMY_LIBADD_COMMON = \
|
||||
$(top_builddir)/src/util/libglvnd_pthread.la
|
||||
$(top_builddir)/src/util/libglvnd_pthread.la \
|
||||
$(top_builddir)/src/util/libtrace.la \
|
||||
$(top_builddir)/src/util/libutils_misc.la
|
||||
EGL_DUMMY_LDFLAGS_COMMON = \
|
||||
-shared \
|
||||
-rpath /nowhere
|
||||
-rpath /nowhere \
|
||||
$(LINKER_FLAG_NO_UNDEFINED)
|
||||
|
||||
check_LTLIBRARIES += libEGL_dummy0.la
|
||||
libEGL_dummy0_la_CFLAGS = \
|
||||
|
|
Loading…
Reference in a new issue