brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Play nice with Wine

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-10-28 22:15:42 +01:00
parent 4d2541429b
commit ed16b5f642
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dpf

@ -1 +1 @@
Subproject commit 6bf4d68dec211900a3f3e184678a904919e4aabc Subproject commit e03017963d4e98cb898a6a1b435ad2ca5bccb537

4
src/CardinalPlugin.cpp
View file

@ -119,7 +119,7 @@ struct Initializer
// Make system dir point to source code location as fallback // Make system dir point to source code location as fallback
asset::systemDir = CARDINAL_PLUGIN_SOURCE_DIR DISTRHO_OS_SEP_STR "Rack"; 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"; templatePath = CARDINAL_PLUGIN_SOURCE_DIR DISTRHO_OS_SEP_STR "template.vcv";
} }
@ -146,7 +146,7 @@ struct Initializer
INFO("Template patch: %s", templatePath.c_str()); INFO("Template patch: %s", templatePath.c_str());
// Check existence of the system res/ directory // 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" d_stderr2("System directory \"%s\" does not exist.\n"
"Make sure Cardinal was downloaded and installed correctly.", asset::systemDir.c_str()); "Make sure Cardinal was downloaded and installed correctly.", asset::systemDir.c_str());

3
src/Makefile.cardinal.mk
View file

@ -123,7 +123,8 @@ endif
ifeq ($(MACOS),true) ifeq ($(MACOS),true)
LINK_FLAGS += -framework IOKit LINK_FLAGS += -framework IOKit
else ifeq ($(WINDOWS),true) else ifeq ($(WINDOWS),true)
LINK_FLAGS += -ldbghelp -lshlwapi # needed by VCVRack
EXTRA_LIBS += -ldbghelp -lshlwapi
# needed by JW-Modules # needed by JW-Modules
EXTRA_LIBS += -lws2_32 -lwinmm EXTRA_LIBS += -lws2_32 -lwinmm
endif endif