From ce5fd3e745292100fb2ea07267b86d5bd6a75dba Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 7 Oct 2021 13:50:38 +0100
Subject: [PATCH] A few mingw related fixes

Signed-off-by: falkTX <falktx@falktx.com>
---
 .gitmodules                                     | 3 +++
 plugins/CVCRack/Makefile                        | 6 ++++++
 plugins/CVCRack/mingw-compat/Shlobj.h           | 1 +
 plugins/CVCRack/mingw-compat/Shlwapi.h          | 1 +
 plugins/CVCRack/mingw-compat/Windows.h          | 1 +
 plugins/CVCRack/mingw-compat/condition_variable | 3 +++
 plugins/CVCRack/mingw-compat/mutex              | 3 +++
 plugins/CVCRack/mingw-compat/thread             | 3 +++
 plugins/CVCRack/mingw-std-threads               | 1 +
 9 files changed, 22 insertions(+)
 create mode 100644 plugins/CVCRack/mingw-compat/Shlobj.h
 create mode 100644 plugins/CVCRack/mingw-compat/Shlwapi.h
 create mode 100644 plugins/CVCRack/mingw-compat/Windows.h
 create mode 100644 plugins/CVCRack/mingw-compat/condition_variable
 create mode 100644 plugins/CVCRack/mingw-compat/mutex
 create mode 100644 plugins/CVCRack/mingw-compat/thread
 create mode 160000 plugins/CVCRack/mingw-std-threads

diff --git a/.gitmodules b/.gitmodules
index 412c4fc..3f67ffd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "dpf"]
 	path = dpf
 	url = https://github.com/DISTRHO/DPF.git
+[submodule "plugins/CVCRack/mingw-std-threads"]
+	path = plugins/CVCRack/mingw-std-threads
+	url = https://github.com/meganz/mingw-std-threads.git
diff --git a/plugins/CVCRack/Makefile b/plugins/CVCRack/Makefile
index 1cc5b81..aa1f806 100644
--- a/plugins/CVCRack/Makefile
+++ b/plugins/CVCRack/Makefile
@@ -52,6 +52,7 @@ FILES_DSP += $(wildcard Rack/src/*/*.cpp)
 EXTRA_LIBS += Rack/dep/lib/libglfw3.a
 EXTRA_LIBS += Rack/dep/lib/libjansson.a
 EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a
+EXTRA_LIBS += Rack/dep/lib/libzstd.a
 
 ifeq ($(WINDOWS),true)
 EXTRA_LIBS += Rack/dep/lib/libarchive_static.a
@@ -90,6 +91,11 @@ BASE_FLAGS += -IRack/dep/osdialog
 BASE_FLAGS += -IRack/dep/oui-blendish
 BASE_FLAGS += -IRack/dep/pffft
 
+ifeq ($(WINDOWS),true)
+BASE_FLAGS      += -Imingw-compat
+BUILD_CXX_FLAGS += -Imingw-std-threads
+endif
+
 ifeq ($(MACOS),true)
 BASE_FLAGS += -DARCH_MAC
 else ifeq ($(WINDOWS),true)
diff --git a/plugins/CVCRack/mingw-compat/Shlobj.h b/plugins/CVCRack/mingw-compat/Shlobj.h
new file mode 100644
index 0000000..5b17afa
--- /dev/null
+++ b/plugins/CVCRack/mingw-compat/Shlobj.h
@@ -0,0 +1 @@
+#include <shlobj.h>
diff --git a/plugins/CVCRack/mingw-compat/Shlwapi.h b/plugins/CVCRack/mingw-compat/Shlwapi.h
new file mode 100644
index 0000000..89b9b63
--- /dev/null
+++ b/plugins/CVCRack/mingw-compat/Shlwapi.h
@@ -0,0 +1 @@
+#include <shlwapi.h>
diff --git a/plugins/CVCRack/mingw-compat/Windows.h b/plugins/CVCRack/mingw-compat/Windows.h
new file mode 100644
index 0000000..776a87c
--- /dev/null
+++ b/plugins/CVCRack/mingw-compat/Windows.h
@@ -0,0 +1 @@
+#include <windows.h>
diff --git a/plugins/CVCRack/mingw-compat/condition_variable b/plugins/CVCRack/mingw-compat/condition_variable
new file mode 100644
index 0000000..7f9970d
--- /dev/null
+++ b/plugins/CVCRack/mingw-compat/condition_variable
@@ -0,0 +1,3 @@
+#pragma once
+#include_next <condition_variable>
+#include "mingw.condition_variable.h"
diff --git a/plugins/CVCRack/mingw-compat/mutex b/plugins/CVCRack/mingw-compat/mutex
new file mode 100644
index 0000000..69cd675
--- /dev/null
+++ b/plugins/CVCRack/mingw-compat/mutex
@@ -0,0 +1,3 @@
+#pragma once
+#include_next <mutex>
+#include "mingw.mutex.h"
diff --git a/plugins/CVCRack/mingw-compat/thread b/plugins/CVCRack/mingw-compat/thread
new file mode 100644
index 0000000..640ddc7
--- /dev/null
+++ b/plugins/CVCRack/mingw-compat/thread
@@ -0,0 +1,3 @@
+#pragma once
+#include_next <thread>
+#include "mingw.thread.h"
diff --git a/plugins/CVCRack/mingw-std-threads b/plugins/CVCRack/mingw-std-threads
new file mode 160000
index 0000000..f6365f9
--- /dev/null
+++ b/plugins/CVCRack/mingw-std-threads
@@ -0,0 +1 @@
+Subproject commit f6365f900fb9b1cd6014c8d1cf13ceacf8faf3de