diff --git a/README.md b/README.md index c20ba7ad..119cf2b0 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,6 @@ This repository contains our fork of HLSDK and restored source code for some of You still needed to copy `valve` directory as all game resources located there. 3) Run the main executable (`xash3d.exe` or AppImage). -Note: on Linux, without AppImage, you may need to create a shell-script with the command `LD_LIBRARY_PATH=. ./xash3d`. - For additional info, run Xash3D with `-help` command line key. ## Contributing diff --git a/game_launch/wscript b/game_launch/wscript index 424d4ffc..4b9ad831 100644 --- a/game_launch/wscript +++ b/game_launch/wscript @@ -37,6 +37,7 @@ def build(bld): features = 'c cxx cxxprogram', includes = includes, use = libs, + rpath = '.', install_path = bld.env.BINDIR, subsystem = bld.env.MSVC_SUBSYSTEM ) diff --git a/scripts/gha/build_linux.sh b/scripts/gha/build_linux.sh index 99e76d43..c238e8d6 100755 --- a/scripts/gha/build_linux.sh +++ b/scripts/gha/build_linux.sh @@ -80,7 +80,6 @@ echo "Xash3D FWGS installed as AppImage." echo "Base directory is $XASH3D_BASEDIR. Set XASH3D_BASEDIR environment variable to override this" export XASH3D_EXTRAS_PAK1="${APPDIR}"/extras.pak -export LD_LIBRARY_PATH="${APPDIR}":$LD_LIBRARY_PATH ${DEBUGGER} "${APPDIR}"/xash3d "$@" exit $? EOF diff --git a/vgui_support/wscript b/vgui_support/wscript index 47a7317a..b3613ec2 100644 --- a/vgui_support/wscript +++ b/vgui_support/wscript @@ -119,6 +119,7 @@ def build(bld): features = 'cxx', includes = includes, use = libs, + rpath = '.', install_path = bld.env.LIBDIR, subsystem = bld.env.MSVC_SUBSYSTEM )