diff options
| author | Dan Nicholson <[email protected]> | 2010-04-19 20:22:48 -0700 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2010-04-19 20:22:48 -0700 |
| commit | 02224ec4e0de8072c9d730821f88e0a00212ff50 (patch) | |
| tree | 565fe9ab2c6380cd81ead1ef468888a837c2edd5 | |
| parent | 35e60aed0bcc63d906dfdd64fe5014b2ca4394f0 (diff) | |
| parent | 88be2171e7336201e5ee97ade36ba3de4fe939bf (diff) | |
Merge branch '7.8'
Conflicts:
progs/egl/Makefile
progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.
| -rw-r--r-- | src/egl/drivers/glx/Makefile | 4 | ||||
| -rw-r--r-- | src/egl/main/Makefile | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/Makefile | 1 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile index 634638f5387..d976b91a74e 100644 --- a/src/egl/drivers/glx/Makefile +++ b/src/egl/drivers/glx/Makefile @@ -10,7 +10,7 @@ EGL_INCLUDES = \ -I$(TOP)/include \ -I$(TOP)/src/egl/main -EGL_CFLAGS = -EGL_LIBS = -lX11 -lGL +EGL_CFLAGS = $(X11_CFLAGS) +EGL_LIBS = $(X11_LIBS) -lGL include ../Makefile.template diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index 31f214cf6f2..3b4ebf7fec4 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -7,7 +7,7 @@ include $(TOP)/configs/current EGL_MAJOR = 1 EGL_MINOR = 0 -INCLUDE_DIRS = -I$(TOP)/include +INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS) HEADERS = \ eglcompiler.h \ diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile index 794785006f5..1768241352f 100644 --- a/src/gallium/state_trackers/egl/Makefile +++ b/src/gallium/state_trackers/egl/Makefile @@ -16,6 +16,7 @@ x11_INCLUDES = \ -I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/glx \ -I$(TOP)/src/mesa \ + $(X11_CFLAGS) \ $(shell pkg-config --cflags-only-I libdrm) x11_SOURCES = $(wildcard x11/*.c) \ diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile index 6cd00cad458..add3a273945 100644 --- a/src/gallium/targets/libgl-xlib/Makefile +++ b/src/gallium/targets/libgl-xlib/Makefile @@ -20,7 +20,8 @@ INCLUDE_DIRS = \ -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/state_trackers/glx/xlib \ - -I$(TOP)/src/gallium/auxiliary + -I$(TOP)/src/gallium/auxiliary \ + $(X11_CFLAGS) DEFINES += \ -DGALLIUM_SOFTPIPE |