diff options
| author | Matt Turner <mattst88@gmail.com> | 2014-01-31 17:37:21 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-02-01 12:32:42 -0800 |
| commit | 5a39b7abe26e6ff42f29861951515b25df837a1d (patch) | |
| tree | 6ba8bbffba5e2afb7656d2661561dfe54ec6b532 | |
| parent | 309f2d2020cf2137845b5e3402b0fc7bc9e96c7b (diff) | |
List X11_LIBS after lib{egl,glx}_common.
Fixes linking with --as-needed.
| -rw-r--r-- | test/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 269a00d..7ac1f38 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -99,32 +99,32 @@ WGL_TESTS = \ WGL_LIBS = libwgl_common.la endif -egl_has_extension_nocontext_LDADD = $(X11_LIBS) $(EPOXY) libegl_common.la +egl_has_extension_nocontext_LDADD = $(EPOXY) libegl_common.la $(X11_LIBS) egl_gles1_without_glx_CPPFLAGS = $(AM_CPPFLAGS) -DGLES_VERSION=1 egl_gles1_without_glx_SOURCES = egl_without_glx.c -egl_gles1_without_glx_LDADD = $(X11_LIBS) $(EPOXY) $(DLOPEN_LIBS) libegl_common.la +egl_gles1_without_glx_LDADD = $(EPOXY) $(DLOPEN_LIBS) libegl_common.la $(X11_LIBS) egl_gles2_without_glx_CPPFLAGS = $(AM_CPPFLAGS) -DGLES_VERSION=2 egl_gles2_without_glx_SOURCES = egl_without_glx.c -egl_gles2_without_glx_LDADD = $(X11_LIBS) $(EPOXY) $(DLOPEN_LIBS) libegl_common.la +egl_gles2_without_glx_LDADD = $(EPOXY) $(DLOPEN_LIBS) libegl_common.la $(X11_LIBS) -glx_beginend_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la $(GL_LIBS) +glx_beginend_LDADD = $(EPOXY) libglx_common.la $(GL_LIBS) $(X11_LIBS) -glx_public_api_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la +glx_public_api_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) -glx_public_api_core_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la +glx_public_api_core_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) -glx_glxgetprocaddress_nocontext_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la +glx_glxgetprocaddress_nocontext_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) -glx_has_extension_nocontext_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la +glx_has_extension_nocontext_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) glx_static_CFLAGS = -DNEEDS_TO_BE_STATIC -glx_static_LDADD = -ldl $(X11_LIBS) $(EPOXY) libglx_common.la +glx_static_LDADD = $(DLOPEN_LIBS) $(EPOXY) libglx_common.la $(X11_LIBS) glx_static_LDFLAGS = -static glx_shared_znow_SOURCES = glx_static.c -glx_shared_znow_LDADD = -ldl $(X11_LIBS) $(EPOXY) libglx_common.la +glx_shared_znow_LDADD = $(DLOPEN_LIBS) $(EPOXY) libglx_common.la $(X11_LIBS) glx_shared_znow_LDFLAGS = -z now wgl_core_and_exts_LDADD = $(EPOXY) libwgl_common.la -lgdi32 |