diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-07 07:56:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-07 07:56:56 +0200 |
| commit | 4dc4001b1b78cc236548d9a01365ee4c04ee22a3 (patch) | |
| tree | 9926bef1a36bfba16e2ef67ea85c916d6ddeaacb /mesalib/Makefile | |
| parent | 336e4aab196609a528213e9ecebcb30fce7aa654 (diff) | |
| parent | 09a5e4f06e54a817ecbb04b3e2bdc28f27fa3e61 (diff) | |
| download | vcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.tar.gz vcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.tar.bz2 vcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/randr/rrcrtc.c
Diffstat (limited to 'mesalib/Makefile')
| -rw-r--r-- | mesalib/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mesalib/Makefile b/mesalib/Makefile index 7a5dae762..f3c0a20a3 100644 --- a/mesalib/Makefile +++ b/mesalib/Makefile @@ -364,12 +364,24 @@ GALLIUM_FILES = \ $(DIRECTORY)/src/gallium/*/*/*/*.[ch] \ $(DIRECTORY)/src/gallium/*/*/*/*.py +APPLE_DRI_FILES = \ + $(DIRECTORY)/src/glx/apple/Makefile \ + $(DIRECTORY)/src/glx/apple/*.[ch] \ + $(DIRECTORY)/src/glx/apple/*.tcl \ + $(DIRECTORY)/src/glx/apple/apple_exports.list \ + $(DIRECTORY)/src/glx/apple/GL_aliases \ + $(DIRECTORY)/src/glx/apple/GL_extensions \ + $(DIRECTORY)/src/glx/apple/GL_noop \ + $(DIRECTORY)/src/glx/apple/GL_promoted \ + $(DIRECTORY)/src/glx/apple/specs/*.spec \ + $(DIRECTORY)/src/glx/apple/specs/*.tm DRI_FILES = \ $(DIRECTORY)/include/GL/internal/dri_interface.h \ $(DIRECTORY)/include/GL/internal/sarea.h \ $(DIRECTORY)/src/glx/Makefile \ $(DIRECTORY)/src/glx/*.[ch] \ + $(APPLE_DRI_FILES) \ $(DIRECTORY)/src/mesa/drivers/dri/Makefile \ $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in \ |