From c6400e5bcd8c8bfef4cd677bc3c17f74250f024a Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Fri, 8 Oct 2021 13:09:17 +0100
Subject: [PATCH] Fix windows build

Signed-off-by: falkTX <falktx@falktx.com>
---
 plugins/Cardinal/CardinalUI.cpp | 2 +-
 plugins/Cardinal/Makefile       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/Cardinal/CardinalUI.cpp b/plugins/Cardinal/CardinalUI.cpp
index 375586f..026a60b 100644
--- a/plugins/Cardinal/CardinalUI.cpp
+++ b/plugins/Cardinal/CardinalUI.cpp
@@ -36,7 +36,7 @@ namespace rack {
 namespace network {
     std::string encodeUrl(const std::string&) { return {}; }
     json_t* requestJson(Method, const std::string&, json_t*, const CookieMap&) { return nullptr; }
-    bool requestDownload(const std::string&, const std::string&, float*, const CookieMap&) { return nullptr; }
+    bool requestDownload(const std::string&, const std::string&, float*, const CookieMap&) { return false; }
 }
 }
 
diff --git a/plugins/Cardinal/Makefile b/plugins/Cardinal/Makefile
index 8fd8286..94eb078 100644
--- a/plugins/Cardinal/Makefile
+++ b/plugins/Cardinal/Makefile
@@ -52,7 +52,6 @@ FILES_DSP += $(filter-out Rack/src/window/Window.cpp, $(wildcard Rack/src/*/*.cp
 
 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
@@ -62,6 +61,8 @@ EXTRA_LIBS += Rack/dep/lib/libarchive.a
 EXTRA_LIBS += Rack/dep/lib/libGLEW.a
 endif
 
+EXTRA_LIBS += Rack/dep/lib/libzstd.a
+
 # --------------------------------------------------------------
 # Do some magic
 
@@ -126,7 +127,8 @@ endif
 
 ifeq ($(MACOS),true)
 LINK_FLAGS += -framework IOKit
-# LINK_FLAGS += -Wl,-all_load
+else ifeq ($(WINDOWS),true)
+LINK_FLAGS += -ldbghelp -lshlwapi
 endif
 
 # LINK_FLAGS += $(OPENGL_LIBS)