diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-19 20:22:48 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-19 20:22:48 -0700 |
| commit | 02224ec4e0de8072c9d730821f88e0a00212ff50 (patch) | |
| tree | 565fe9ab2c6380cd81ead1ef468888a837c2edd5 /src/egl | |
| 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.
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/drivers/glx/Makefile | 4 | ||||
| -rw-r--r-- | src/egl/main/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile index 634638f538..d976b91a74 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 31f214cf6f..3b4ebf7fec 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 \ |