Browse Source

wscript: set rpath to current folder, LD_LIBRARY_PATH is unneeded anymore

Fix README and AppImage launch script accordingly
pull/2/head
Alibek Omarov 3 years ago
parent
commit
8169c2a40b
  1. 2
      README.md
  2. 1
      game_launch/wscript
  3. 1
      scripts/gha/build_linux.sh
  4. 1
      vgui_support/wscript

2
README.md

@ -35,8 +35,6 @@ This repository contains our fork of HLSDK and restored source code for some of @@ -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

1
game_launch/wscript

@ -37,6 +37,7 @@ def build(bld): @@ -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
)

1
scripts/gha/build_linux.sh

@ -80,7 +80,6 @@ echo "Xash3D FWGS installed as AppImage." @@ -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

1
vgui_support/wscript

@ -119,6 +119,7 @@ def build(bld): @@ -119,6 +119,7 @@ def build(bld):
features = 'cxx',
includes = includes,
use = libs,
rpath = '.',
install_path = bld.env.LIBDIR,
subsystem = bld.env.MSVC_SUBSYSTEM
)

Loading…
Cancel
Save