diff options
| -rw-r--r-- | configs/linux-dri-xcb | 4 | ||||
| -rw-r--r-- | src/glx/x11/glxext.c | 2 | ||||
| -rw-r--r-- | src/glx/x11/indirect.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index d61cc7f20c..cb327fa60f 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -24,7 +24,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN -X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I xcb-glx` +X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx` CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math @@ -41,7 +41,7 @@ LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ - $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs xcb-glx` + $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx` # This is now 0 by default since it seems to confuse the hell out of people diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c index 7e9327b59e..f47caae43d 100644 --- a/src/glx/x11/glxext.c +++ b/src/glx/x11/glxext.c @@ -64,7 +64,7 @@ #endif #ifdef USE_XCB -#include <X11/xcl.h> +#include <X11/Xlib-xcb.h> #include <xcb/xcb.h> #include <xcb/glx.h> #endif diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c index 4f615baa17..80b6011bdd 100644 --- a/src/glx/x11/indirect.c +++ b/src/glx/x11/indirect.c @@ -32,7 +32,7 @@ #include "indirect_size.h" #include <GL/glxproto.h> #ifdef USE_XCB -#include <X11/xcl.h> +#include <X11/Xlib-xcb.h> #include <xcb/xcb.h> #include <xcb/glx.h> #endif /* USE_XCB */ |