diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-13 19:59:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-13 19:59:46 +0200 |
| commit | 0d495843cebea4ae94a3138db2bf51da80a16391 (patch) | |
| tree | 6e7b747c07035ae3a29ee3fb73e1eb43df7d2f8d /mesalib/src/mapi/glapi/sources.mak | |
| parent | 01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b (diff) | |
| parent | f4babb3a422e27cd33fba36f7a21eb67b7dee25d (diff) | |
| download | vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.gz vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.bz2 vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/extensions/configure.ac
X11/xtrans/configure.ac
X11/xtrans/doc/Makefile.am
libX11/configure.ac
libX11/docbook.am
libXdmcp/configure.ac
libXdmcp/doc/Makefile.am
libXext/configure.ac
libXext/docbook.am
libXmu/configure.ac
libXmu/doc/Makefile.am
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/state_tracker/st_draw.c
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'mesalib/src/mapi/glapi/sources.mak')
| -rw-r--r-- | mesalib/src/mapi/glapi/sources.mak | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/mesalib/src/mapi/glapi/sources.mak b/mesalib/src/mapi/glapi/sources.mak index 39e18d16f..dfc6cc6db 100644 --- a/mesalib/src/mapi/glapi/sources.mak +++ b/mesalib/src/mapi/glapi/sources.mak @@ -1,18 +1,19 @@ -# src/mapi/glapi/sources.mak
-
-GLAPI_SOURCES = \
- glapi_dispatch.c \
- glapi_entrypoint.c \
- glapi_getproc.c \
- glapi_nop.c \
- glthread.c \
- glapi.c
-
-X86_API = \
- glapi_x86.S
-
-X86-64_API = \
- glapi_x86-64.S
-
-SPARC_API = \
- glapi_sparc.S
+# src/mapi/glapi/sources.mak + +GLAPI_SOURCES = \ + glapi_dispatch.c \ + glapi_entrypoint.c \ + glapi_gentable.c \ + glapi_getproc.c \ + glapi_nop.c \ + glthread.c \ + glapi.c + +X86_API = \ + glapi_x86.S + +X86-64_API = \ + glapi_x86-64.S + +SPARC_API = \ + glapi_sparc.S |