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.
macos/v1.5.9
Eric Anholt 11 years ago
parent 5c4f73fa7f
commit e58e98feee
  1. 1
      test/Makefile.am
  2. 2
      test/glx_static.c

@ -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_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la
glx_has_extension_nocontext_DEPENDENCIES = $(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_LDFLAGS = -ldl $(X11_LIBS) -static $(EPOXY) libglx_common.la
glx_static_DEPENDENCIES = $(EPOXY) libglx_common.la glx_static_DEPENDENCIES = $(EPOXY) libglx_common.la

@ -48,10 +48,12 @@ main(int argc, char **argv)
bool pass = true; bool pass = true;
int val; int val;
#if NEEDS_TO_BE_STATIC
if (dlsym(NULL, "epoxy_glCompileShader")) { if (dlsym(NULL, "epoxy_glCompileShader")) {
fprintf(stderr, "glx_static requires epoxy built with --enable-static\n"); fprintf(stderr, "glx_static requires epoxy built with --enable-static\n");
return 77; return 77;
} }
#endif
Display *dpy = get_display_or_skip(); Display *dpy = get_display_or_skip();
make_glx_context_current_or_skip(dpy); make_glx_context_current_or_skip(dpy);

Loading…
Cancel
Save