Mesa (master): build: Fix GLES linkage with libglapi
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Aug 23 21:06:42 UTC 2012
Module: Mesa
Branch: master
Commit: fc9ea7c74dc5cb996c3d9fe6663fd6da080e8360
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc9ea7c74dc5cb996c3d9fe6663fd6da080e8360
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Aug 23 13:48:36 2012 -0700
build: Fix GLES linkage with libglapi
Reported-by: Ian Romanick <idr at freedesktop.org>
---
src/mapi/es1api/Makefile.am | 2 +-
src/mapi/es2api/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mapi/es1api/Makefile.am b/src/mapi/es1api/Makefile.am
index 5c7258f..c49c86e 100644
--- 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 edd3c9f..7430780 100644
--- 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
More information about the mesa-commit
mailing list