openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-11-25 00:09:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make sure libGL.so links with libglsl

Browse Source 
Can't link against *.la files if we're not using libtool to link.

Fixes undefined symbol: _ZN23ir_hierarchical_visitor5visitEP11ir_variable
This commit is contained in:
Matt Turner 2012-01-31 11:54:24 -05:00
parent d36f89c8cf
commit f53e7e981e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -401,6 +401,7 @@ GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}
GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION} GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}
VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION} VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}
GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION} GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION}
GLSL_LIB_NAME='libglsl.'${LIB_EXTENSION}
GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
@ -420,6 +421,7 @@ AC_SUBST([GLESv1_CM_LIB_NAME])
AC_SUBST([GLESv2_LIB_NAME]) AC_SUBST([GLESv2_LIB_NAME])
AC_SUBST([VG_LIB_NAME]) AC_SUBST([VG_LIB_NAME])
AC_SUBST([GLAPI_LIB_NAME]) AC_SUBST([GLAPI_LIB_NAME])
AC_SUBST([GLSL_LIB_NAME])
AC_SUBST([GL_LIB_GLOB]) AC_SUBST([GL_LIB_GLOB])
AC_SUBST([GLU_LIB_GLOB]) AC_SUBST([GLU_LIB_GLOB])

2
src/mesa/sources.mak
View File

@ -368,7 +368,7 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
### Other archives/libraries ### Other archives/libraries
GLSL_LIBS = \ GLSL_LIBS = \
$(TOP)/src/glsl/libglsl.la $(TOP)/src/glsl/.libs/$(GLSL_LIB_NAME)
### Include directories ### Include directories