diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-09 09:27:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-09 09:27:21 +0200 |
| commit | 0de14292c4fac98f91105baf9cc16e58f25d4d77 (patch) | |
| tree | 1704165c3d7f05bde08dc6d3d52ee33aed0f270f /mesalib/Makefile | |
| parent | 637bc31135b378ea9521b5a93b14bdce482da209 (diff) | |
| parent | 0a9d2abef2e6fac5d52556969655a62711df6418 (diff) | |
| download | vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.gz vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.bz2 vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/include/GL/internal/dri_interface.h
mesalib/src/gallium/auxiliary/util/u_math.h
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/SConscript
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/main/es_generator.py
mesalib/src/mesa/main/imports.h
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_draw.c
mesalib/src/mesa/state_tracker/st_program.c
mesalib/src/mesa/vbo/vbo_save_api.c
xorg-server/xkeyboard-config/configure.in
xorg-server/xkeyboard-config/rules/Makefile.am
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/symbols/cz
xorg-server/xkeyboard-config/symbols/in
Diffstat (limited to 'mesalib/Makefile')
| -rw-r--r-- | mesalib/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mesalib/Makefile b/mesalib/Makefile index e77e64925..07ec68688 100644 --- a/mesalib/Makefile +++ b/mesalib/Makefile @@ -231,6 +231,7 @@ MAIN_FILES = \ $(DIRECTORY)/include/GL/wglext.h \ $(DIRECTORY)/include/GL/wmesa.h \ $(DIRECTORY)/include/pci_ids/*.h \ + $(DIRECTORY)/include/c99/*.h \ $(DIRECTORY)/src/getopt/SConscript \ $(DIRECTORY)/src/getopt/getopt*.[ch] \ $(DIRECTORY)/src/glsl/Makefile \ @@ -367,15 +368,7 @@ GALLIUM_FILES = \ 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 + $(DIRECTORY)/src/glx/apple/*.[ch] DRI_FILES = \ $(DIRECTORY)/include/GL/internal/dri_interface.h \ |