diff options
| -rwxr-xr-x | release/bin/blender-softwaregl | 8 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/release/bin/blender-softwaregl b/release/bin/blender-softwaregl index 8628dca2202..acd4dc3eec5 100755 --- a/release/bin/blender-softwaregl +++ b/release/bin/blender-softwaregl @@ -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 diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 7457358698d..278cd4362c3 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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 |