Merge remote-tracking branch 'gzdoom/master' into gzdoom_merge

tools/AppImageBuilder.yml

@@ -0,0 +1,49 @@
+# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
+
+version: 1
+
+AppDir:
+  app_info:
+    id: com.VKDoom.app
+    name: VKDoom
+    icon: game_icon.png
+    version: latest
+    exec: ./vkdoom
+    exec_args: $@
+
+  runtime:
+    path_mappings:
+      - /usr/share/games/doom:$APPDIR/usr/share/games/doom
+
+  files:
+    include:
+    - /lib64/ld-linux-x86-64.so.2
+    - /lib64/libbz2.so.1
+    exclude:
+    - usr/share/man
+    - usr/share/doc/*/README.*
+    - usr/share/doc/*/changelog.*
+    - usr/share/doc/*/NEWS.*
+    - usr/share/doc/*/TODO.*
+
+  # ... why are these so old ?
+  test:
+    fedora-30:
+      image: appimagecrafters/tests-env:fedora-30
+      command: ./AppRun
+    debian-stable:
+      image: appimagecrafters/tests-env:debian-stable
+      command: ./AppRun
+    archlinux-latest:
+      image: appimagecrafters/tests-env:archlinux-latest
+      command: ./AppRun
+    centos-7:
+      image: appimagecrafters/tests-env:centos-7
+      command: ./AppRun
+    ubuntu-xenial:
+      image: appimagecrafters/tests-env:ubuntu-xenial
+      command: ./AppRun
+
+AppImage:
+  arch: x86_64
+  update-information: guess

tools/re2c/src/ir/adfa/prepare.cc

@@ -125,7 +125,7 @@ void DFA::findBaseState()
 						operator delete (s->go.span);
 						s->go.nSpans = nSpans;
 						s->go.span = allocate<Span> (nSpans);
-						memcpy(s->go.span, span, nSpans*sizeof(Span));
+						memcpy((void*)(s->go.span), span, nSpans*sizeof(Span));
 					}
 
 					break;

tools/update-subtrees.cmd

@@ -0,0 +1,7 @@
+@echo off
+setlocal
+cd "%~dp0"
+for /f "delims=" %%I in ('where git.exe') do set GIT_PATH="%%~dpI"
+if errorlevel 1 echo "Unable to find git.exe!"
+if errorlevel 1 goto :eof
+%GIT_PATH%\..\bin\bash.exe update-subtrees.sh %*

tools/update-subtrees.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+export GITROOT="$(git rev-parse --show-toplevel)"
+
+pull() {
+	if [[ "${1}" == "${2}" || "${1}" == "all" ]]
+	then
+		echo "fetching ${2}"
+		git -C $GITROOT subtree pull --prefix="${3}" "${4}" "${5}" --squash || exit
+	else
+		echo "${2} not specified, skipping"
+	fi
+}
+
+pull "$1" 'zwidget' 'libraries/ZWidget' 'https://github.com/dpjudas/ZWidget' 'master'
+pull "$1" 'zmusic'  'libraries/ZMusic'  'https://github.com/ZDoom/ZMusic'    'master'