Browse Source

Setup Carla paths for Windows

Signed-off-by: falkTX <falktx@falktx.com>
pull/192/head
falkTX 3 years ago
parent
commit
93b1649792
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 19 additions and 6 deletions
  1. +12
    -3
      plugins/Cardinal/src/Carla.cpp
  2. +7
    -3
      plugins/Cardinal/src/Ildaeil.cpp

+ 12
- 3
plugins/Cardinal/src/Carla.cpp View File

@@ -99,6 +99,11 @@ struct CarlaModule : Module {
CardinalExpanderFromCarlaMIDIToCV* midiOutExpander = nullptr;
std::string patchStorage;

#ifdef CARLA_OS_WIN
// must keep string pointer valid
std::string winResourceDir;
#endif

CarlaModule()
: pcontext(static_cast<CardinalPluginContext*>(APP))
{
@@ -138,10 +143,14 @@ struct CarlaModule : Module {
binaryDir = "/Applications/Carla.app/Contents/MacOS";
resourceDir = "/Applications/Carla.app/Contents/MacOS/resources";
}
#elif defined(CARLA_OS_WINDOWS)
// Carla does not support system-wide install on Windows right now
if (false)
#elif defined(CARLA_OS_WIN)
const std::string winBinaryDir = system::join(asset::systemDir, "Carla");

if (system::exists(winBinaryDir))
{
winResourceDir = system::join(winBinaryDir, "resources");
binaryDir = winBinaryDir.c_str();
resourceDir = winResourceDir.c_str();
}
#else
if (system::exists("/usr/local/lib/carla"))


+ 7
- 3
plugins/Cardinal/src/Ildaeil.cpp View File

@@ -209,10 +209,14 @@ struct IldaeilModule : Module {
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/Applications/Carla.app/Contents/MacOS");
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/Applications/Carla.app/Contents/MacOS/resources");
}
#elif defined(CARLA_OS_WINDOWS)
// Carla does not support system-wide install on Windows right now
if (false)
#elif defined(CARLA_OS_WIN)
const std::string winBinaryDir = system::join(asset::systemDir, "Carla");

if (system::exists(winBinaryDir))
{
const std::string winResourceDir = system::join(winBinaryDir, "resources");
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, winBinaryDir.c_str());
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, winResourceDir.c_str());
}
#else
if (system::exists("/usr/local/lib/carla"))


Loading…
Cancel
Save