From ed16b5f642eba90c37ddda893f150452bad95477 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 28 Oct 2021 22:15:42 +0100 Subject: [PATCH] Play nice with Wine Signed-off-by: falkTX --- dpf | 2 +- src/CardinalPlugin.cpp | 4 ++-- src/Makefile.cardinal.mk | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dpf b/dpf index 6bf4d68..e030179 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 6bf4d68dec211900a3f3e184678a904919e4aabc +Subproject commit e03017963d4e98cb898a6a1b435ad2ca5bccb537 diff --git a/src/CardinalPlugin.cpp b/src/CardinalPlugin.cpp index 08f8761..d92b7b5 100644 --- a/src/CardinalPlugin.cpp +++ b/src/CardinalPlugin.cpp @@ -119,7 +119,7 @@ struct Initializer // Make system dir point to source code location as fallback asset::systemDir = CARDINAL_PLUGIN_SOURCE_DIR DISTRHO_OS_SEP_STR "Rack"; - if (system::isDirectory(system::join(asset::systemDir, "res"))) + if (system::exists(system::join(asset::systemDir, "res"))) { templatePath = CARDINAL_PLUGIN_SOURCE_DIR DISTRHO_OS_SEP_STR "template.vcv"; } @@ -146,7 +146,7 @@ struct Initializer INFO("Template patch: %s", templatePath.c_str()); // Check existence of the system res/ directory - if (! system::isDirectory(asset::systemDir)) + if (! system::exists(asset::systemDir)) { d_stderr2("System directory \"%s\" does not exist.\n" "Make sure Cardinal was downloaded and installed correctly.", asset::systemDir.c_str()); diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 6b7cb19..d66a35d 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -123,7 +123,8 @@ endif ifeq ($(MACOS),true) LINK_FLAGS += -framework IOKit else ifeq ($(WINDOWS),true) -LINK_FLAGS += -ldbghelp -lshlwapi +# needed by VCVRack +EXTRA_LIBS += -ldbghelp -lshlwapi # needed by JW-Modules EXTRA_LIBS += -lws2_32 -lwinmm endif