diff --git a/release/bin/blender-launcher b/release/bin/blender-launcher new file mode 100755 index 0000000000000000000000000000000000000000..521e2c8219936d3a6ebef824ea61f8fa9caf99ce --- /dev/null +++ b/release/bin/blender-launcher @@ -0,0 +1,12 @@ +#!/bin/sh +BF_DIST_BIN=$(dirname "$0") +BF_PROGRAM="blender" + +# Add own lib folder first, because Steam or other environments may set an +# LD_LIBRARY_PATH that has priority over the runpath in the Blender excutable, +# but contains incompatible libraries. +LD_LIBRARY_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH} + +export LD_LIBRARY_PATH + +exec "$BF_DIST_BIN/$BF_PROGRAM" ${1+"$@"} diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a7bd94dcfd072ece4108e45b87691073d1f6ee01..0773b4e372255f1b09a7e068c3b0d0c718e3e7fa 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -619,6 +619,7 @@ if(UNIX AND NOT APPLE) install( PROGRAMS + ${CMAKE_SOURCE_DIR}/release/bin/blender-launcher ${CMAKE_SOURCE_DIR}/release/bin/blender-softwaregl DESTINATION "." ) diff --git a/tools/check_blender_release/check_static_binaries.py b/tools/check_blender_release/check_static_binaries.py index 2015452d99f5cf73913070586eee162f095fcf04..14eb15cf1e0825fcbce51046e18e7d113f607b00 100644 --- a/tools/check_blender_release/check_static_binaries.py +++ b/tools/check_blender_release/check_static_binaries.py @@ -51,7 +51,7 @@ ALLOWED_LIBS = ( "libfreetype.so", ) -IGNORE_FILES = ("blender-softwaregl", ) +IGNORE_FILES = ("blender-launcher", "blender-softwaregl", ) IGNORE_EXTENSION = (".sh", ".py", )