diff options
| author | marha <marha@users.sourceforge.net> | 2015-01-04 16:25:32 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-01-04 16:25:32 +0100 |
| commit | 5e5a48ff8cd08f123601cd0625ca62a86675aac9 (patch) | |
| tree | ea1c2cee139e8e1ce389a7f956e9874db1e0a650 /mesalib/src/mapi | |
| parent | a1011d63ffb5cc4f41bf0f4622ee3f1493d419d9 (diff) | |
| download | vcxsrv-5e5a48ff8cd08f123601cd0625ca62a86675aac9.tar.gz vcxsrv-5e5a48ff8cd08f123601cd0625ca62a86675aac9.tar.bz2 vcxsrv-5e5a48ff8cd08f123601cd0625ca62a86675aac9.zip | |
fontconfig libX11 mesa xserver git update 4 Jan 2015
xserver commit dc777c346d5d452a53b13b917c45f6a1bad2f20b
libX11 commit 446f5f7f41317a85a0cd0efa5e6a1b37bc99fba2
fontconfig commit 4420b27c074821a1d1f9d6ebe822a610176a417d
mesa commit 48094d0e6554a9df36bf00fc2793ade46cf92406
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/.gitignore | 2 | ||||
| -rw-r--r-- | mesalib/src/mapi/Makefile.am | 19 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/Makefile.am | 3 |
3 files changed, 18 insertions, 6 deletions
diff --git a/mesalib/src/mapi/.gitignore b/mesalib/src/mapi/.gitignore new file mode 100644 index 000000000..0d280c9b6 --- /dev/null +++ b/mesalib/src/mapi/.gitignore @@ -0,0 +1,2 @@ +shared-glapi-test +glapi-test diff --git a/mesalib/src/mapi/Makefile.am b/mesalib/src/mapi/Makefile.am index 80ead821c..024283c55 100644 --- a/mesalib/src/mapi/Makefile.am +++ b/mesalib/src/mapi/Makefile.am @@ -19,7 +19,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -SUBDIRS = glapi/gen . +SUBDIRS = TESTS = TOP = $(top_srcdir) @@ -32,6 +32,13 @@ check_PROGRAMS = pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = +EXTRA_DIST = \ + es1api/ABI-check \ + es2api/ABI-check \ + mapi_abi.py \ + glapi/SConscript \ + shared-glapi/SConscript + AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CPPFLAGS = \ $(DEFINES) \ @@ -62,9 +69,6 @@ shared_glapi_libglapi_la_LDFLAGS = \ $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) -shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) - $(call glapi_gen_mapi,$<,shared-glapi) - TESTS += shared-glapi-test check_PROGRAMS += shared-glapi-test @@ -77,6 +81,9 @@ shared_glapi_test_LDADD = \ $(top_builddir)/src/gtest/libgtest.la endif +shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) + $(call glapi_gen_mapi,$<,shared-glapi) + if HAVE_OPENGL noinst_LTLIBRARIES = glapi/libglapi.la @@ -158,10 +165,10 @@ es1api_libGLESv1_CM_la_LDFLAGS = \ if HAVE_SHARED_GLAPI es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la endif +endif es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) $(call glapi_gen_mapi,$<,es1api) -endif if HAVE_OPENGL_ES2 TESTS += es2api/ABI-check @@ -202,10 +209,10 @@ es2api_libGLESv2_la_LDFLAGS = \ if HAVE_SHARED_GLAPI es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la endif +endif es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) $(call glapi_gen_mapi,$<,es2api) -endif if HAVE_OPENVG SUBDIRS += vgapi diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 7f76f1971..e56b46e3d 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -75,6 +75,7 @@ EXTRA_DIST= \ glX_proto_size.py \ glX_server_table.py \ remap_helper.py \ + SConscript \ gl_API.dtd ###################################################################### @@ -106,6 +107,7 @@ API_XML = \ gl_API.xml \ es_EXT.xml \ gl_and_es_API.xml \ + gl_and_glX_API.xml \ ARB_base_instance.xml \ ARB_blend_func_extended.xml \ ARB_clear_buffer_object.xml \ @@ -176,6 +178,7 @@ API_XML = \ EXT_transform_feedback.xml \ INTEL_performance_query.xml \ KHR_debug.xml \ + KHR_context_flush_control.xml \ NV_conditional_render.xml \ NV_primitive_restart.xml \ NV_texture_barrier.xml \ |