diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
| commit | 1c96f09adce1625dcbae5fe303d7c551a6c1bad3 (patch) | |
| tree | 70b5bbde90432287ae91513b8a4edcc55fcf9e9e /mesalib/src/mapi/glapi/Makefile.am | |
| parent | 697c9a1917acd36a1b99e0d263baf2514446ca11 (diff) | |
| parent | 63bfcd0be46413dda8c22b914d12f66ea5d5c66d (diff) | |
| download | vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.gz vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.bz2 vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/gl_gentable.py
xorg-server/include/servermd.h
Diffstat (limited to 'mesalib/src/mapi/glapi/Makefile.am')
| -rw-r--r-- | mesalib/src/mapi/glapi/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/Makefile.am b/mesalib/src/mapi/glapi/Makefile.am index e425bacea..cadcd69d6 100644 --- a/mesalib/src/mapi/glapi/Makefile.am +++ b/mesalib/src/mapi/glapi/Makefile.am @@ -48,13 +48,13 @@ if HAVE_SHARED_GLAPI AM_CPPFLAGS += \ -DMAPI_MODE_BRIDGE \ -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" -glapi_GLAPI_sources = +glapi_GLAPI_sources = $(GLAPI_UTIL_SOURCES) glapi_ASM_sources = glapi_MAPI_sources = $(MAPI_BRIDGE_FILES) else AM_CPPFLAGS += \ -DMAPI_MODE_UTIL -glapi_GLAPI_sources = $(GLAPI_SOURCES) +glapi_GLAPI_sources = $(GLAPI_SOURCES) $(GLAPI_UTIL_SOURCES) glapi_ASM_sources = $(GLAPI_ASM_SOURCES) glapi_MAPI_sources = $(MAPI_UTIL_FILES) endif |