projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e592f7d)
build: Fix GLES linkage with libglapi
authorMatt Turner <mattst88@gmail.com>
Thu, 23 Aug 2012 20:48:36 +0000 (13:48 -0700)
committerMatt Turner <mattst88@gmail.com>
Thu, 23 Aug 2012 21:07:35 +0000 (14:07 -0700)
Reported-by: Ian Romanick <idr@freedesktop.org>
src/mapi/es1api/Makefile.am patch | blob | history
src/mapi/es2api/Makefile.am patch | blob | history

diff --git a/src/mapi/es1api/Makefile.am b/src/mapi/es1api/Makefile.am
index 5c7258fa13c68e4b226a98973fbf9bbcc5a80a4c..c49c86ebeed7bfd40671a7553d20fe7aea710bca 100644 (file)
--- a/src/mapi/es1api/Makefile.am
+++ b/src/mapi/es1api/Makefile.am
@@ -41,7 +41,7 @@ GLES_include_HEADERS = \
 lib_LTLIBRARIES = libGLESv1_CM.la
 
 libGLESv1_CM_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h
-libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS)
+libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS) ../shared-glapi/libglapi.la
 libGLESv1_CM_la_LDFLAGS = -version-number 1:1 -no-undefined
 
 include ../glapi/gen/glapi_gen.mk
diff --git a/src/mapi/es2api/Makefile.am b/src/mapi/es2api/Makefile.am
index edd3c9f2c32cb02d2b5b5ec43f831b8bcd959dc4..74307809dfa43dcee1d0356f86ca9d943e05ef80 100644 (file)
--- a/src/mapi/es2api/Makefile.am
+++ b/src/mapi/es2api/Makefile.am
@@ -41,7 +41,7 @@ GLES_include_HEADERS = \
 lib_LTLIBRARIES = libGLESv2.la
 
 libGLESv2_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h
-libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
+libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS) ../shared-glapi/libglapi.la
 libGLESv2_la_LDFLAGS = -version-number 2 -no-undefined
 
 include ../glapi/gen/glapi_gen.mk