Update release.

12 files changed, 51 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b983ea8cbc80..a402595593f3 100755..100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = serioussam-vk
 	pkgdesc = Serious Sam Classic native Linux version with Vulkan support and XPLUS Modification.
 	pkgver = 1.10.4
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/tx00100xt/SeriousSamClassic-VK
 	arch = i686
 	arch = x86_64
diff --git a/.gitignore b/.gitignore
index f23ce66c4845..f23ce66c4845 100755..100644
--- a/.gitignore
+++ b/.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index d9c63bf7f9d7..ab7dd61baa86 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer:  tx00100xt <tx00100xt@yandex.ru>
-# Contributer: tx00100xt <tx00100xt@yandex.ru>>
+# Maintainer:  Alexander <tx00100xt@yandex.ru>
+# Contributer: Alexander <tx00100xt@yandex.ru>>
 
 pkgname=serioussam-vk
 pkginstdir=serioussam
@@ -7,7 +7,7 @@ xplus_tfe=SamTFE-XPLUS.tar.xz
 xplus_tse=SamTSE-XPLUS.tar.xz
 pkgver=1.10.4
 _srcname="SeriousSamClassic-VK-$pkgver"
-pkgrel=6
+pkgrel=7
 pkgdesc="Serious Sam Classic native Linux version with Vulkan support and XPLUS Modification."
 arch=('i686' 'x86_64')
 url="https://github.com/tx00100xt/SeriousSamClassic-VK"
@@ -26,8 +26,6 @@ source=("https://github.com/tx00100xt/SeriousSamClassic-VK/archive/refs/tags/v$p
     "serioussam-tfe.desktop"
     "serioussam-tse.desktop"
     "serioussam.xpm"
-    "serioussam-tfe.sh"
-    "serioussam-tse.sh"
     "tfe-vk-last-update.patch"
     "tse-vk-last-update.patch"
     "fix-thunder.patch"
@@ -45,11 +43,9 @@ sha256sums=('951fea8274cf795c1bdcff708e1dffbef78cd7993585144b565aefba93433e08'
             '28a90da56de5d6591a2e65154778030ba28b375d29556fd7e1db085d2c00b877'
             '93fe183a2f0a35989b3d1678dddb1c5976cda94747d4186c6f36af4ccf144443'
             '8282f527b54e9d8fe009640b7634560f3b4bf0fc9b72cdc2f865f1c226339d35'
-            '8e9f0d7138ab5da6b4b899f39234f6e3c48d0d47970c6b12372e33e86e39d606'
-            '134bbc9088b8c323c9a17a7ea8a39942e4cf4b83e149cb4f89e161adf7290122'
+            '1e36d7b0d11f68729aa5c79ac9a44157d4af0bf61060040ab92a37d96ca89aba'
+            '49680c65d26b264a1d7735c6310fcc5d0ac0e0e56273d3bccf539c0c87d31b2b'
             '1fd56e04072372e1e8dab0bae40da1519d82a28895cbe5661b18561ee9ea47b4'
-            '092d0806cba13368419c63887dec4dd556ffc63d0421634e268c544260f78b1f'
-            '6332bcfe309be35f5381bdf3dc7c334674a936b3793ac0840dc9992e9a98d6a3'
             '08cb78b2c5a487e8d644971729dd391851ec476b3e92d683d9d4f256b229dbac'
             'a82821d12ebadb5ecade4b0169ff9497b6d00d6b0a9c4a0112a5915be1057542'
             'ad07c6b9d29a0d8a1a276b0c00d07e2d24d8c63c425efa21daa31ec3c1d366df'
@@ -135,6 +131,11 @@ build(){
   rm -f  "$srcdir/$_srcname"/{*.sh,*.old,*.patch}
   rm -fr "$srcdir/$_srcname/Images"
 
+  mv -f "$srcdir/$_srcname/SamTFE/Bin/SeriousSam" "$srcdir/$_srcname/SamTFE/Bin/serioussam"
+  mv -f "$srcdir/$_srcname/SamTFE/Bin/DedicatedServer" "$srcdir/$_srcname/SamTFE/Bin/serioussam-ded"
+  mv -f "$srcdir/$_srcname/SamTSE/Bin/SeriousSam" "$srcdir/$_srcname/SamTSE/Bin/serioussamse"
+  mv -f "$srcdir/$_srcname/SamTSE/Bin/DedicatedServer" "$srcdir/$_srcname/SamTSE/Bin/serioussamse-ded"
+
   # fix scripts for AMD cards
   sed -i 's/mdl_bFineQuality = 0;/mdl_bFineQuality = 1;/g' "$srcdir/$_srcname/SamTFE/Scripts/GLSettings/RAM.ini"
   sed -i 's/mdl_bFineQuality = 0;/mdl_bFineQuality = 1;/g' "$srcdir/$_srcname/SamTFE/Scripts/GLSettings/ATI-RPRO.ini"
@@ -146,19 +147,44 @@ package(){
   # Making sure directories exist.
   install -d $pkgdir/usr/share/{applications,pixmaps,licenses}
   install -d $pkgdir/usr/bin/
+  install -d $pkgdir/usr/lib/{serioussam,serioussam/Mods,serioussam/Mods/XPLUS}
+  install -d $pkgdir/usr/lib/{serioussamse,serioussamse/Mods,serioussamse/Mods/XPLUS}
 
   # Install license.
   install -D -m 644 $srcdir/$_srcname/LICENSE \
        $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
-  # Install data.
-  mv "$srcdir/$_srcname" "$pkgdir/usr/share/$pkginstdir"
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Bin/serioussam $pkgdir/usr/bin
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Bin/serioussam-ded $pkgdir/usr/bin
+
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Bin/libEngine.so $pkgdir/usr/lib
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Bin/libGame.so $pkgdir/usr/lib/serioussam
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Bin/libEntities.so $pkgdir/usr/lib/serioussam
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Bin/libShaders.so $pkgdir/usr/lib/serioussam
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Bin/libamp11lib.so $pkgdir/usr/lib/serioussam
+
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/serioussamse $pkgdir/usr/bin
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/serioussamse-ded $pkgdir/usr/bin
+
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/libEngineMP.so $pkgdir/usr/lib
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/libGameMP.so $pkgdir/usr/lib/serioussamse
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/libEntitiesMP.so $pkgdir/usr/lib/serioussamse
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/libShaders.so $pkgdir/usr/lib/serioussamse
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/libamp11lib.so $pkgdir/usr/lib/serioussamse
 
-  # Install helper scripts.
-  install -D -m 755 $srcdir/serioussam-tfe.sh \
-       $pkgdir/usr/share/$pkginstdir/SamTFE
-  install -D -m 755 $srcdir/serioussam-tse.sh \
-       $pkgdir/usr/share/$pkginstdir/SamTSE
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Mods/XPLUS/Bin/libGame.so $pkgdir/usr/lib/serioussam/Mods/XPLUS
+  install -D -m0755 $srcdir/$_srcname/SamTFE/Mods/XPLUS/Bin/libEntities.so $pkgdir/usr/lib/serioussam/Mods/XPLUS
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Mods/XPLUS/Bin/libGameMP.so $pkgdir/usr/lib/serioussamse/Mods/XPLUS
+  install -D -m0755 $srcdir/$_srcname/SamTSE/Mods/XPLUS/Bin/libEntitiesMP.so $pkgdir/usr/lib/serioussamse/Mods/XPLUS
+
+  rm -fr "$srcdir/$_srcname/SamTFE/Bin"
+  rm -fr "$srcdir/$_srcname/SamTSE/Bin"
+  rm -fr "$srcdir/$_srcname/SamTFE/Mods/XPLUS/Bin"
+  rm -fr "$srcdir/$_srcname/SamTSE/Mods/XPLUS/Bin"
+
+  # Install data.
+  mv "$srcdir/$_srcname/SamTFE"  $pkgdir/usr/share/serioussam
+  mv "$srcdir/$_srcname/SamTSE"  $pkgdir/usr/share/serioussamse
 
   # Install desktop file.
   install -D -m 644 $srcdir/serioussam-tfe.desktop \
@@ -170,8 +196,4 @@ package(){
   install -D -m 644 $srcdir/serioussam.xpm \
            $pkgdir/usr/share/pixmaps/serioussam.xpm
 
-  # Create symlinks to add the serioussam startup and utility scripts to usr/bin
-  ln -s /usr/share/$pkginstdir/SamTFE/serioussam-tfe.sh $pkgdir/usr/bin/serioussam-tfe || return 1
-  ln -s /usr/share/$pkginstdir/SamTSE/serioussam-tse.sh $pkgdir/usr/bin/serioussam-tse || return 1
-
 }
diff --git a/fix-thunder.patch b/fix-thunder.patch
index 9f59d5024538..9f59d5024538 100755..100644
--- a/fix-thunder.patch
+++ b/fix-thunder.patch
diff --git a/serioussam-tfe.desktop b/serioussam-tfe.desktop
index fbf9d18ed468..b597285feea2 100755..100644
--- a/serioussam-tfe.desktop
+++ b/serioussam-tfe.desktop
@@ -2,8 +2,8 @@
 Name=Serious Sam The First Encounter
 Type=Application
 Comment=Linux port of Serious Sam Classic The First Encounter
-Exec=serioussam-tfe
-TryExec=serioussam-tfe
+Exec=serioussam
+TryExec=serioussam
 Icon=serioussam
 Categories=Application;Game;
 
diff --git a/serioussam-tfe.sh b/serioussam-tfe.sh
deleted file mode 100755
index aba6222ca4a3..000000000000
--- a/serioussam-tfe.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd "/usr/share/serioussam/SamTFE/Bin"
-export LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}"
-./SeriousSam $1 $2
diff --git a/serioussam-tse.desktop b/serioussam-tse.desktop
index 054253e8e234..74c606aaf36f 100755..100644
--- a/serioussam-tse.desktop
+++ b/serioussam-tse.desktop
@@ -2,7 +2,7 @@
 Name=Serious Sam The Second Encounter
 Type=Application
 Comment=Linux port of Serious Sam Classic The Second Encounter
-Exec=serioussam-tse
-TryExec=serioussam-tse
+Exec=serioussamse
+TryExec=serioussamse
 Icon=serioussam
 Categories=Application;Game;
diff --git a/serioussam-tse.sh b/serioussam-tse.sh
deleted file mode 100755
index c17db2b15d34..000000000000
--- a/serioussam-tse.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd "/usr/share/serioussam/SamTSE/Bin"
-export LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}"
-./SeriousSam $1 $2
diff --git a/serioussam.install b/serioussam.install
index 7be3d9face90..6c1ca0cbe137 100755..100644
--- a/serioussam.install
+++ b/serioussam.install
@@ -2,11 +2,11 @@ post_install() {
 	echo ""
 	echo "     ***************************************************************************************"
 	echo "     If you have access to a copy of the game (either by CD or through Steam),"
-	echo "     you can copy the *.gro files to the /usr/share/serioussam/SamTFE directory."
+	echo "     you can copy the *.gro files to the /usr/share/serioussam directory."
 	echo "     for the game Serious Sam Classic The First Encounter and copy the *.gro files "
-	echo "     to the /usr/share/serioussam/SamTSE directory. for Second Encounter"
+	echo "     to the /usr/share/serioussamse directory. for Second Encounter"
 	echo "     ***************************************************************************************"
-	echo "     Copy all *.gro files and Help folder from the game directory to SamTFE directory."
+	echo "     Copy all *.gro files and Help folder from the game directory to serioussam directory."
 	echo "     At the current time the files are:"
 	echo "      - Help (folder)"
 	echo "      - Levels (folder)"
@@ -16,7 +16,7 @@ post_install() {
 	echo "      - 1_00c_scripts.gro"
 	echo "      - 1_04_patch.gro"
 	echo "     ***************************************************************************************"
-	echo "     Copy all *.gro files and Help folder from the game directory to SamTSE directory."
+	echo "     Copy all *.gro files and Help folder from the game directory to serioussamse directory."
 	echo "     At the current time the files are:"
 	echo "      - Help (folder)"
 	echo "      - SE1_00.gro"
diff --git a/serioussam.xpm b/serioussam.xpm
index 9a7ae6246ace..9a7ae6246ace 100755..100644
--- a/serioussam.xpm
+++ b/serioussam.xpm
diff --git a/tfe-vk-last-update.patch b/tfe-vk-last-update.patch
index 6eb7282662ca..6eb7282662ca 100755..100644
--- a/tfe-vk-last-update.patch
+++ b/tfe-vk-last-update.patch
diff --git a/tse-vk-last-update.patch b/tse-vk-last-update.patch
index 03b73442afce..03b73442afce 100755..100644
--- a/tse-vk-last-update.patch
+++ b/tse-vk-last-update.patch