From 452c72b2845bdf608295fb0f2272caa8882af0b6 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 3 Mar 2019 14:39:49 +0100
Subject: [PATCH] Update Tyrquake

---
 .gitmodules                          |  2 +-
 libretro/cores/tyrquake/Tuprules.tup | 37 ++++++++++++++++++++++++++++
 libretro/cores/tyrquake/archives     |  1 -
 libretro/cores/tyrquake/core         |  1 -
 libretro/cores/tyrquake/upstream     |  1 +
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 libretro/cores/tyrquake/Tuprules.tup
 delete mode 160000 libretro/cores/tyrquake/core
 create mode 160000 libretro/cores/tyrquake/upstream

diff --git a/.gitmodules b/.gitmodules
index c202db9f6..965beeebc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -44,7 +44,7 @@
 	path = libretro/cores/snes9x/upstream
 	url = https://github.com/libretro/snes9x
 [submodule "libretro/cores/tyrquake/core"]
-	path = libretro/cores/tyrquake/core
+	path = libretro/cores/tyrquake/upstream
 	url = https://github.com/libretro/tyrquake
 [submodule "libretro/cores/samples"]
 	path = libretro/cores/samples/upstream
diff --git a/libretro/cores/tyrquake/Tuprules.tup b/libretro/cores/tyrquake/Tuprules.tup
new file mode 100644
index 000000000..3bc0b34f0
--- /dev/null
+++ b/libretro/cores/tyrquake/Tuprules.tup
@@ -0,0 +1,37 @@
+CORE_PKGS += libc libm
+
+USE_CODEC_WAVE=1
+USE_CODEC_FLAC=1
+USE_CODEC_VORBIS=1
+
+CFLAGS+= -DUSE_CODEC_WAVE
+CFLAGS+= -DUSE_CODEC_FLAC
+CFLAGS+= -DUSE_CODEC_VORBIS
+
+GIT_VERSION = `git describe --always`
+CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+
+CFLAGS += -O2 -DNDEBUG
+
+CFLAGS += $(INCFLAGS)
+
+CFLAGS += -DINLINE=inline
+CFLAGS += -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H
+CFLAGS += -DNQ_HACK -DQBASEDIR=$(CORE_DIR) -DTYR_VERSION=0.62
+CFLAGS += -fomit-frame-pointer
+
+include upstream/Makefile.common
+
+: foreach $(SOURCES_C) |> !libretro_cc |> {libretro_objs}
+
+: {libretro_objs} |> !libretro_core_link |> {core}
+: {core} |> !publish_core |> {binary}
+
+: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
+: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
+
+ifdef DEPOT_KEY
+: {binary}  |> !depot_bin_tarball |> {tarballs}
+: {package} |> !depot_pkg_tarball |> {tarballs}
+: foreach {tarballs} |> !public_signature |>
+endif
diff --git a/libretro/cores/tyrquake/archives b/libretro/cores/tyrquake/archives
index 84884d8e0..063830292 100644
--- a/libretro/cores/tyrquake/archives
+++ b/libretro/cores/tyrquake/archives
@@ -1,5 +1,4 @@
 @SDK_USER@/src/libc/@SDK_VERSION@
 @SDK_USER@/src/vfs/@SDK_VERSION@
 @DEPOT_USER@/src/retro_frontend/@DEPOT_VERSION@
-@DEPOT_USER@/src/libretro-tyrquake/@DEPOT_VERSION@
 ehmry/raw/quake_shareware/1.06
diff --git a/libretro/cores/tyrquake/core b/libretro/cores/tyrquake/core
deleted file mode 160000
index 9ab2b7adc..000000000
--- a/libretro/cores/tyrquake/core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9ab2b7adcc46322755a757a34da20cd494c01e3a
diff --git a/libretro/cores/tyrquake/upstream b/libretro/cores/tyrquake/upstream
new file mode 160000
index 000000000..0bc90d8c9
--- /dev/null
+++ b/libretro/cores/tyrquake/upstream
@@ -0,0 +1 @@
+Subproject commit 0bc90d8c997fb58b7a4c2f4c252745a1dec0835e