mapi: Inline es2api/Makefile.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
parent
18ef5136b6
commit
dff5a219d0
|
@ -2237,7 +2237,6 @@ AC_CONFIG_FILES([Makefile
|
||||||
src/loader/Makefile
|
src/loader/Makefile
|
||||||
src/mapi/Makefile
|
src/mapi/Makefile
|
||||||
src/mapi/es1api/glesv1_cm.pc
|
src/mapi/es1api/glesv1_cm.pc
|
||||||
src/mapi/es2api/Makefile
|
|
||||||
src/mapi/es2api/glesv2.pc
|
src/mapi/es2api/glesv2.pc
|
||||||
src/mapi/glapi/Makefile
|
src/mapi/glapi/Makefile
|
||||||
src/mapi/glapi/gen/Makefile
|
src/mapi/glapi/gen/Makefile
|
||||||
|
|
|
@ -110,7 +110,47 @@ es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HAVE_OPENGL_ES2
|
if HAVE_OPENGL_ES2
|
||||||
SUBDIRS += es2api
|
TESTS += es2api/ABI-check
|
||||||
|
|
||||||
|
BUILT_SOURCES += es2api/glapi_mapi_tmp.h
|
||||||
|
|
||||||
|
pkgconfig_DATA += es2api/glesv2.pc
|
||||||
|
|
||||||
|
GLES2_includedir = $(includedir)/GLES2
|
||||||
|
GLES2_include_HEADERS = \
|
||||||
|
$(top_srcdir)/include/GLES2/gl2.h \
|
||||||
|
$(top_srcdir)/include/GLES2/gl2ext.h \
|
||||||
|
$(top_srcdir)/include/GLES2/gl2platform.h
|
||||||
|
GLES3_includedir = $(includedir)/GLES3
|
||||||
|
GLES3_include_HEADERS = \
|
||||||
|
$(top_srcdir)/include/GLES3/gl3.h \
|
||||||
|
$(top_srcdir)/include/GLES3/gl31.h \
|
||||||
|
$(top_srcdir)/include/GLES3/gl3ext.h \
|
||||||
|
$(top_srcdir)/include/GLES3/gl3platform.h
|
||||||
|
|
||||||
|
lib_LTLIBRARIES += es2api/libGLESv2.la
|
||||||
|
|
||||||
|
es2api_libGLESv2_la_SOURCES = entry.c es2api/glapi_mapi_tmp.h
|
||||||
|
es2api_libGLESv2_la_CFLAGS = \
|
||||||
|
$(AM_CFLAGS) \
|
||||||
|
$(VISIBILITY_CFLAGS)
|
||||||
|
es2api_libGLESv2_la_CPPFLAGS = \
|
||||||
|
$(AM_CPPFLAGS) \
|
||||||
|
-DMAPI_MODE_BRIDGE \
|
||||||
|
-DMAPI_ABI_HEADER=\"es2api/glapi_mapi_tmp.h\"
|
||||||
|
es2api_libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
|
||||||
|
es2api_libGLESv2_la_LDFLAGS = \
|
||||||
|
-no-undefined \
|
||||||
|
-version-number 2 \
|
||||||
|
$(GC_SECTIONS) \
|
||||||
|
$(LD_NO_UNDEFINED)
|
||||||
|
|
||||||
|
if HAVE_SHARED_GLAPI
|
||||||
|
es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la
|
||||||
|
endif
|
||||||
|
|
||||||
|
es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
|
||||||
|
$(call glapi_gen_mapi,$<,es2api)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HAVE_OPENVG
|
if HAVE_OPENVG
|
||||||
|
|
|
@ -1,69 +0,0 @@
|
||||||
# Copyright © 2012 Intel Corporation
|
|
||||||
#
|
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
# copy of this software and associated documentation files (the "Software"),
|
|
||||||
# to deal in the Software without restriction, including without limitation
|
|
||||||
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
||||||
# and/or sell copies of the Software, and to permit persons to whom the
|
|
||||||
# Software is furnished to do so, subject to the following conditions:
|
|
||||||
#
|
|
||||||
# The above copyright notice and this permission notice (including the next
|
|
||||||
# paragraph) shall be included in all copies or substantial portions of the
|
|
||||||
# Software.
|
|
||||||
#
|
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
||||||
# IN THE SOFTWARE.
|
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
|
||||||
$(DEFINES) \
|
|
||||||
-I$(top_srcdir)/include \
|
|
||||||
-I$(top_srcdir)/src/mapi \
|
|
||||||
-DMAPI_MODE_BRIDGE \
|
|
||||||
-DMAPI_ABI_HEADER=\"glapi_mapi_tmp.h\"
|
|
||||||
|
|
||||||
AM_CFLAGS = $(VISIBILITY_CFLAGS)
|
|
||||||
|
|
||||||
TESTS = ABI-check
|
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
|
||||||
pkgconfig_DATA = glesv2.pc
|
|
||||||
|
|
||||||
GLES2_includedir = $(includedir)/GLES2
|
|
||||||
GLES2_include_HEADERS = \
|
|
||||||
$(top_srcdir)/include/GLES2/gl2.h \
|
|
||||||
$(top_srcdir)/include/GLES2/gl2ext.h \
|
|
||||||
$(top_srcdir)/include/GLES2/gl2platform.h
|
|
||||||
GLES3_includedir = $(includedir)/GLES3
|
|
||||||
GLES3_include_HEADERS = \
|
|
||||||
$(top_srcdir)/include/GLES3/gl3.h \
|
|
||||||
$(top_srcdir)/include/GLES3/gl31.h \
|
|
||||||
$(top_srcdir)/include/GLES3/gl3ext.h \
|
|
||||||
$(top_srcdir)/include/GLES3/gl3platform.h
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = libGLESv2.la
|
|
||||||
|
|
||||||
libGLESv2_la_SOURCES = ../entry.c glapi_mapi_tmp.h
|
|
||||||
libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
|
|
||||||
libGLESv2_la_LDFLAGS = \
|
|
||||||
-no-undefined \
|
|
||||||
-version-number 2 \
|
|
||||||
$(GC_SECTIONS) \
|
|
||||||
$(LD_NO_UNDEFINED)
|
|
||||||
|
|
||||||
if HAVE_SHARED_GLAPI
|
|
||||||
libGLESv2_la_LIBADD += ../shared-glapi/libglapi.la
|
|
||||||
endif
|
|
||||||
|
|
||||||
include ../glapi/gen/glapi_gen.mk
|
|
||||||
glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
|
|
||||||
$(call glapi_gen_mapi,$<,es2api)
|
|
||||||
|
|
||||||
BUILT_SOURCES = glapi_mapi_tmp.h
|
|
||||||
CLEANFILES = $(BUILT_SOURCES)
|
|
||||||
|
|
||||||
include $(top_srcdir)/install-lib-links.mk
|
|
Loading…
Reference in New Issue