forked from bartvdbraak/blender
Linux: Move Mesa software OpenGL libraries to sub-directory
Allows to put libraries which are always needed by Blender into the lib/ folder and not worry about OpenGL libraries picked up from there. Currently no functional changes as we do not yet have dynamic libraries which we load at startup. It allows to use direct linking of oneAPI Cycles device (see D15397), also it is something which would need to happen to support USD/Hydra/TBB compiler as dynamic libraries in the future. Differential Revision: https://developer.blender.org/D15403
This commit is contained in:
parent
0f50ae131f
commit
f391e8f316
@ -2,16 +2,16 @@
|
||||
BF_DIST_BIN=$(dirname "$0")
|
||||
BF_PROGRAM="blender" # BF_PROGRAM=$(basename "$0")-bin
|
||||
|
||||
LD_LIBRARY_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH}
|
||||
LD_LIBRARY_PATH=${BF_DIST_BIN}/lib/mesa:${LD_LIBRARY_PATH}
|
||||
|
||||
if [ -n "$LD_LIBRARYN32_PATH" ]; then
|
||||
LD_LIBRARYN32_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN32_PATH}
|
||||
LD_LIBRARYN32_PATH=${BF_DIST_BIN}/lib/mesa:${LD_LIBRARYN32_PATH}
|
||||
fi
|
||||
if [ -n "$LD_LIBRARYN64_PATH" ]; then
|
||||
LD_LIBRARYN64_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN64_PATH}
|
||||
LD_LIBRARYN64_PATH=${BF_DIST_BIN}/lib/mesa:${LD_LIBRARYN64_PATH}
|
||||
fi
|
||||
if [ -n "$LD_LIBRARY_PATH_64" ]; then
|
||||
LD_LIBRARY_PATH_64=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH_64}
|
||||
LD_LIBRARY_PATH_64=${BF_DIST_BIN}/lib/mesa:${LD_LIBRARY_PATH_64}
|
||||
fi
|
||||
|
||||
# Workaround for half-transparent windows when compiz is enabled
|
||||
|
@ -511,7 +511,7 @@ if(UNIX AND NOT APPLE)
|
||||
endif()
|
||||
|
||||
if(EXISTS ${LIBDIR}/mesa)
|
||||
install(DIRECTORY ${LIBDIR}/mesa/lib DESTINATION ".")
|
||||
install(DIRECTORY ${LIBDIR}/mesa/lib/ DESTINATION "lib/mesa/")
|
||||
|
||||
install(
|
||||
PROGRAMS
|
||||
|
Loading…
Reference in New Issue
Block a user