diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 08:53:23 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 08:53:23 +0000 |
| commit | 58cad0a2ccb28b1f82763d80861c6085def38b30 (patch) | |
| tree | 8f199bc844429c0ca70acb457cd48a354b6ff177 /lib/mesa/src/mapi/Makefile.am | |
| parent | 21ab4c9f31674b113c24177398ed39f29b7cd8e6 (diff) | |
Merge Mesa 13.0.2
Diffstat (limited to 'lib/mesa/src/mapi/Makefile.am')
| -rw-r--r-- | lib/mesa/src/mapi/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/mesa/src/mapi/Makefile.am b/lib/mesa/src/mapi/Makefile.am index e5e1a64f1..42442534b 100644 --- a/lib/mesa/src/mapi/Makefile.am +++ b/lib/mesa/src/mapi/Makefile.am @@ -56,14 +56,17 @@ PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) glapi_gen_mapi_deps := \ mapi_abi.py \ - $(wildcard glapi/gen/*.xml) \ - $(wildcard glapi/gen/*.py) + $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \ + $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py) if HAVE_SHARED_GLAPI BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h lib_LTLIBRARIES += shared-glapi/libglapi.la shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h +shared_glapi_libglapi_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(VISIBILITY_CFLAGS) shared_glapi_libglapi_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DMAPI_MODE_GLAPI \ @@ -118,6 +121,9 @@ glapi_libglapi_la_CPPFLAGS = \ if HAVE_APPLEDRI glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c endif +if HAVE_WINDOWSDRI +glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c +endif if HAVE_SHARED_GLAPI glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h @@ -211,6 +217,7 @@ GLES3_includedir = $(includedir)/GLES3 GLES3_include_HEADERS = \ $(top_srcdir)/include/GLES3/gl3.h \ $(top_srcdir)/include/GLES3/gl31.h \ + $(top_srcdir)/include/GLES3/gl32.h \ $(top_srcdir)/include/GLES3/gl3ext.h \ $(top_srcdir)/include/GLES3/gl3platform.h |