Fixing build issues

4 files changed, 12 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 285f04063253..9753ddc78adb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openra-d2-git
 	pkgdesc = A Dune II-inspired mod of OpenRA
-	pkgver = 189.git.3c1489a
+	pkgver = 199.git.4837e48
 	pkgrel = 1
 	url = https://github.com/OpenRA/d2
 	install = openra-d2.install
@@ -28,9 +28,8 @@ pkgbase = openra-d2-git
 	source = openra-d2.appdata.xml
 	source = openra-d2.desktop
 	md5sums = SKIP
-	md5sums = f883c23d492f8c930aca5ad2c3624cc2
+	md5sums = fef36e5d463cf157f4d5bfbe3f0dce54
 	md5sums = e6c82533bf669122fd26f2d60ed97a6f
 	md5sums = ad2adc9f6f5f756492371b38c996d44c
 
 pkgname = openra-d2-git
-
diff --git a/.gitignore b/.gitignore
index de5eee32a109..a371699a7e81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pkg
 src
 *.gz
 *.log*
+*.zst
diff --git a/PKGBUILD b/PKGBUILD
index 35d77011e73a..659bf36f250d 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=openra-d2-git
 _pkgname=openra-d2
-pkgver=189.git.3c1489a
+pkgver=199.git.4837e48
 pkgrel=1
 pkgdesc="A Dune II-inspired mod of OpenRA"
 arch=('any')
@@ -19,7 +19,7 @@ source=("git+${url}.git"
 "openra-d2.appdata.xml"
 "openra-d2.desktop")
 md5sums=('SKIP'
-         'f883c23d492f8c930aca5ad2c3624cc2'
+         'fef36e5d463cf157f4d5bfbe3f0dce54'
          'e6c82533bf669122fd26f2d60ed97a6f'
          'ad2adc9f6f5f756492371b38c996d44c')
 
@@ -34,20 +34,22 @@ prepare() {
     cd $srcdir/d2
     dos2unix *.md
     chmod +x *.sh
+    make version VERSION="${pkgver}"
 }
 
 build() {
     cd $srcdir/d2
-    make version VERSION="${pkgver}"
-    make engine
-    make core
+    #make version VERSION="${pkgver}"
+    #make engine
+    #make core
+    make
 }
 
 package() {
     cd $srcdir/d2
     mkdir -p $pkgdir/usr/{lib/${_pkgname}/mods,bin,share/pixmaps,share/doc/packages/openra-d2,share/applications,share/appdata}
     install -dm775 $pkgdir/var/games/openra-d2
-    cp -r engine/{glsl,lua,AUTHORS,COPYING,*.dll*,'global mix database.dat',launch-dedicated.sh,launch-game.sh,OpenRA.Game.exe,OpenRA.Server.exe,OpenRA.Utility.exe,VERSION} $pkgdir/usr/lib/openra-d2
+    cp -r engine/{glsl,lua,bin/*,AUTHORS,COPYING,'global mix database.dat',launch-dedicated.sh,launch-game.sh,VERSION} $pkgdir/usr/lib/openra-d2
     cp -r mods/d2 $pkgdir/usr/lib/${_pkgname}/mods
     cp -r engine/mods/{common,modcontent,d2k,cnc,ra} $pkgdir/usr/lib/${_pkgname}/mods
     install -Dm755 $srcdir/openra-d2 $pkgdir/usr/bin/openra-d2
diff --git a/openra-d2 b/openra-d2
index 1b6916ef5f8b..667a26acd1cc 100755
--- a/openra-d2
+++ b/openra-d2
@@ -2,7 +2,7 @@
 cd "/usr/lib/openra-d2"
 
 # Run the game
-mono --debug OpenRA.Game.exe Game.Mod=d2 Engine.LaunchPath="/usr/bin/openra-d2" "Engine.ModSearchPaths=/usr/lib/openra-d2/mods" "$@"
+mono --debug OpenRA.exe Game.Mod=d2 Engine.LaunchPath="/usr/bin/openra-d2" "Engine.ModSearchPaths=/usr/lib/openra-d2/mods" "$@"
 
 # Show a crash dialog if something went wrong
 if [ $? != 0 ] && [ $? != 1 ]; then