summaryrefslogtreecommitdiffstats
path: root/src/mapi/es2api
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2012-12-06 18:36:25 +0100
committerAndreas Boll <andreas.boll.dev@gmail.com>2012-12-07 09:21:44 +0100
commit520892688af7ce9baca6e2b72e7e7eaebe02260c (patch)
tree2f401cd3e69d77fe9a0fe092c8a320d7d7f06064 /src/mapi/es2api
parent5b2a3443facc561f928fe054abd3542cdda51be9 (diff)
downloadexternal_mesa3d-520892688af7ce9baca6e2b72e7e7eaebe02260c.zip
external_mesa3d-520892688af7ce9baca6e2b72e7e7eaebe02260c.tar.gz
external_mesa3d-520892688af7ce9baca6e2b72e7e7eaebe02260c.tar.bz2
build: Fix GLES linkage without libglapi
fixes a regression introduced with fc9ea7c74dc5cb996c3d9fe6663fd6da080e8360 NOTE: This is a candidate for the 9.0 branch. Reported-by: Brian Paul <brianp@vmware.com> Acked-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mapi/es2api')
-rw-r--r--src/mapi/es2api/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mapi/es2api/Makefile.am b/src/mapi/es2api/Makefile.am
index 5e02e1c..0538f73 100644
--- a/src/mapi/es2api/Makefile.am
+++ b/src/mapi/es2api/Makefile.am
@@ -45,9 +45,13 @@ GLES3_include_HEADERS = \
lib_LTLIBRARIES = libGLESv2.la
libGLESv2_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h
-libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS) ../shared-glapi/libglapi.la
+libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
libGLESv2_la_LDFLAGS = -version-number 2 -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)