now compiles, need wad gen code

3 files changed, 40 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c828e88faf7d..001c4dc3f2df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = doomrl-git
 	pkgdesc = Doom: The Rogue-like (git-latest) (WIP!).
 	pkgver = r8.0cbac80
-	pkgrel = 6
+	pkgrel = 7
 	url = http://drl.chaosforge.org/
 	arch = any
 	license = GPL3
@@ -19,12 +19,14 @@ pkgbase = doomrl-git
 	source = disable-asmcse-opt.patch
 	source = disable-offending-shell-code.patch
 	source = hard-code-svn-revision.patch
+	source = fix-lua-dynamic-linking.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 590c28b4e7f655e23c01bca0b2f9ddf9b8dd024f3a8b7ac5ec65d79877a6450b
 	sha256sums = 1844d4698da23f31276f71e2fdd369959b41eac0b69677a147bd534b9c32b5ce
 	sha256sums = 439de08ce548b0dc7ff6ba31ace7f375a1e6f0ebac32addf8a05d3d31283e192
 	sha256sums = e57148577e3152c99a61adb7ae841272491b7be62b168b8d62ee73b322b37418
+	sha256sums = 8b7be4a787422722da65b3c184178f221d5ec76e60f11fda371aa27c9808ea9d
 
 pkgname = doomrl-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 295671cf41c1..b79363416e0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=doomrl-git
 pkgver=r8.0cbac80
 doomrl_assets='doomrl-linux-assets-x64-0997'
-pkgrel=6
+pkgrel=7
 pkgdesc="Doom: The Rogue-like (git-latest) (WIP!)."
 arch=(any)
 url="http://drl.chaosforge.org/"
@@ -16,6 +16,7 @@ source=("$pkgname::git+https://github.com/ChaosForge/doomrl"
 	'disable-asmcse-opt.patch'
 	'disable-offending-shell-code.patch'
 	'hard-code-svn-revision.patch'
+	'fix-lua-dynamic-linking.patch'
 	)
 sha256sums=('SKIP'
 	    'SKIP'
@@ -23,11 +24,14 @@ sha256sums=('SKIP'
 	    '1844d4698da23f31276f71e2fdd369959b41eac0b69677a147bd534b9c32b5ce'
 	    '439de08ce548b0dc7ff6ba31ace7f375a1e6f0ebac32addf8a05d3d31283e192'
 	    'e57148577e3152c99a61adb7ae841272491b7be62b168b8d62ee73b322b37418'
+	    '8b7be4a787422722da65b3c184178f221d5ec76e60f11fda371aa27c9808ea9d'
 	    )
 
 prepare()
 {
 
+  msg2 "Cleaning files"
+
   # clean
   find "$srcdir/$pkgname" "$srcdir/fpcvalkyrie" \
   '(' -iname '*.o' -or -iname '*.ppu' ')' -exec rm -f '{}' ';'
@@ -36,11 +40,14 @@ prepare()
   cp -ru "$srcdir/$doomrl_assets/mp3"/* "$srcdir/$pkgname/bin/mp3"
   cp -ru "$srcdir/$doomrl_assets/wavhq"/* "$srcdir/$pkgname/bin/wavhq" 
 
+  msg2 "Patching"
+
   # patch
   cd "${srcdir}"
   patch -p1 < disable-asmcse-opt.patch
   patch -p1 < disable-offending-shell-code.patch
   patch -p1 < hard-code-svn-revision.patch
+  patch -p1 < fix-lua-dynamic-linking.patch
 
 }
 
@@ -56,15 +63,29 @@ build()
   rm -rf tmp && mkdir tmp
 
   # add Linux config
+  msg2 "Compiling doomrl"
   echo "OS=\"LINUX\"" > "$srcdir/$pkgname/config.lua"
   echo "VALKYRIE_ROOT=\"$srcdir/fpcvalkyrie/\"" >> "$srcdir/$pkgname/config.lua"
-  lua makefile.lua hq
+  FPCOPT=''  lua makefile.lua hq
 
+  # Generate wad
+  msg2 "Generating wad file(s)"
+  $srcdir/$pkgname/bin/makewad
 
 }
 
 package() {
 
+  # check for doomrl executable first
+  # Even if compile fails, it often will just continue on
+  # Doesn't seem to exit fully
+  if [[ ! -f "$srcdir/$pkgname/bin/doomrl" ]]; then
+
+	echo "ERROR: Cannot find built binary. Exiting build."
+	exit 1
+
+  fi
+
 	msg2 "Installing configuration files..."
 	# TODO
 
diff --git a/fix-lua-dynamic-linking.patch b/fix-lua-dynamic-linking.patch
new file mode 100644
index 000000000000..9e3fa289a607
--- /dev/null
+++ b/fix-lua-dynamic-linking.patch
@@ -0,0 +1,14 @@
+diff -ruN src.orig/fpcvalkyrie/src/valkyrie.inc src/fpcvalkyrie/src/valkyrie.inc
+--- src.orig/fpcvalkyrie/src/valkyrie.inc	2016-12-21 09:10:08.592888936 -0500
++++ src/fpcvalkyrie/src/valkyrie.inc	2016-12-21 10:41:46.704057836 -0500
+@@ -17,6 +17,10 @@
+   {$OPTIMIZATION ON}
+ {$ENDIF}
+ 
++{$IFDEF LINUX}
++  {$DEFINE LUA_DYNAMIC}
++{$ENDIF}
++
+ {$DEFINE VINLINE}
+ {$IFDEF FREEBSD}
+   {$UNDEF VINLINE}