Fix vgui.so and change directory structure

3 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05c0bcb25d4a..54192ee392c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xash3d-fwgs-git
 	pkgdesc = A custom GoldSrc engine implementation
-	pkgver = r1906.55a29e6e
+	pkgver = r2045.360dc4f7
 	pkgrel = 1
 	url = http://xash.su/
 	arch = x86_64
@@ -14,7 +14,7 @@ pkgbase = xash3d-fwgs-git
 	source = xash3d-fwgs-git::git+https://github.com/FWGS/xash3d-fwgs
 	source = xash3d
 	md5sums = SKIP
-	md5sums = 2d482084b4edc75846be920a3fa4b950
+	md5sums = 6daaa685de3566fb45708de6c45581ff
 	depends_x86_64 = lib32-freetype2
 	depends_x86_64 = lib32-fontconfig
 	depends_x86_64 = lib32-libpulse
diff --git a/PKGBUILD b/PKGBUILD
index e4ecc1ecc3ea..4de54503bcd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: r4v3n6101
 
 pkgname=xash3d-fwgs-git
-pkgver=r1906.55a29e6e
+pkgver=r2045.360dc4f7
 pkgrel=1
 pkgdesc="A custom GoldSrc engine implementation"
 arch=('x86_64')
@@ -15,7 +15,7 @@ makedepends_x86_64=('gcc-multilib' 'lib32-gcc-libs')
 provides=('xash3d')
 conflicts=('xash3d-hlsdk' 'xash3d-git')
 source=("$pkgname::git+https://github.com/FWGS/xash3d-fwgs" xash3d)
-md5sums=('SKIP' '2d482084b4edc75846be920a3fa4b950')
+md5sums=('SKIP' '6daaa685de3566fb45708de6c45581ff')
 
 pkgver() {
     cd $srcdir/$pkgname
@@ -37,6 +37,6 @@ package() {
     cd $srcdir
     install -Dm 755 "xash3d" "${pkgdir}/usr/bin/xash3d"
     cd $pkgname
-    ./waf install --strip --destdir="${pkgdir}/usr/local/lib/xash3d/"
-    install -Dm 755 "vgui_support/vgui-dev/lib/vgui.so" "${pkgdir}/usr/local/lib/xash3d/vgui.so"
+    ./waf install --strip --destdir="${pkgdir}/opt/xash3d/"
+    install -Dm 755 "3rdparty/vgui_support/vgui-dev/lib/vgui.so" "${pkgdir}/opt/xash3d/vgui.so"
 }
diff --git a/xash3d b/xash3d
index b1657d3e60fd..d19198174fce 100644
--- a/xash3d
+++ b/xash3d
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib/xash3d/"
-export XASH3D_BASEDIR="$HOME/.xash3d"
+export XASH3D_RODIR="/opt/xash3d/"
+export XASH3D_BASEDIR="$HOME/.xash3d/"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${XASH3D_RODIR}"
 
 if [ ! -d "$XASH3D_BASEDIR" ]; then
-    echo "$XASH3D_BASEDIR not found. Create a new one and put gamefiles into it (e.g. $XASH3D_BASEDIR/valve/)"
+    echo "$XASH3D_BASEDIR not found. Create a new one and put gamefiles into it (e.g. ${XASH3D_BASEDIR}valve/)"
     exit 1
 fi
 
-/usr/local/lib/xash3d/xash3d "$@"
+/opt/xash3d/xash3d "$@"