diff options
| author | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
| commit | 2bf95c519e755146704f4942b1703d47d18bfeaa (patch) | |
| tree | 9d29c5d56014377013770615611f903cd5b25292 /src/glx/Makefile | |
| parent | f36846c77ee196881c0da560229279fc7ed88170 (diff) | |
| parent | 8042d751debb7a8375e8bc587189fea9a5a8371d (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/tests/unit/SConscript
Diffstat (limited to 'src/glx/Makefile')
| -rw-r--r-- | src/glx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glx/Makefile b/src/glx/Makefile index 3d92ebbe038..dd96973ea8f 100644 --- a/src/glx/Makefile +++ b/src/glx/Makefile @@ -64,6 +64,7 @@ INCLUDES = -I. \ -I$(TOP)/src/mapi/glapi \ $(LIBDRM_CFLAGS) \ $(DRI2PROTO_CFLAGS) \ + $(GLPROTO_CFLAGS) \ $(X11_INCLUDES) |