diff options
| author | Eric Anholt <eric@anholt.net> | 2013-12-13 16:59:49 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-12-13 17:00:56 -0800 |
| commit | e58e98feee46d9862fcac985f3e5b91a3f770b61 (patch) | |
| tree | 99928cbd79bde59765686e75ad561f3d9fa046b5 /test | |
| parent | 5c4f73fa7f4b680977d5b1fcced28107cccc3a7e (diff) | |
Fix the behavior of glx_shared_znow if it doesn't die at startup.
We're sharing the source file with glx_static, but we don't want to
SKIP due to not being statically linked.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 1 | ||||
| -rw-r--r-- | test/glx_static.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 43be8e5..1b774a1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -107,6 +107,7 @@ glx_glxgetprocaddress_nocontext_DEPENDENCIES = $(EPOXY) libglx_common.la glx_has_extension_nocontext_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la glx_has_extension_nocontext_DEPENDENCIES = $(EPOXY) libglx_common.la +glx_static_CFLAGS = -DNEEDS_TO_BE_STATIC glx_static_LDFLAGS = -ldl $(X11_LIBS) -static $(EPOXY) libglx_common.la glx_static_DEPENDENCIES = $(EPOXY) libglx_common.la diff --git a/test/glx_static.c b/test/glx_static.c index 981435f..d528a60 100644 --- a/test/glx_static.c +++ b/test/glx_static.c @@ -48,10 +48,12 @@ main(int argc, char **argv) bool pass = true; int val; +#if NEEDS_TO_BE_STATIC if (dlsym(NULL, "epoxy_glCompileShader")) { fprintf(stderr, "glx_static requires epoxy built with --enable-static\n"); return 77; } +#endif Display *dpy = get_display_or_skip(); make_glx_context_current_or_skip(dpy); |