Browse Source

Set a custom fallback systemdir per OS

Signed-off-by: falkTX <falktx@falktx.com>
pull/192/head
falkTX 3 years ago
parent
commit
f3f1c5cd46
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 14 additions and 4 deletions
  1. +13
    -3
      src/CardinalPlugin.cpp
  2. +1
    -1
      src/override/common.cpp

+ 13
- 3
src/CardinalPlugin.cpp View File

@@ -151,11 +151,21 @@ struct Initializer
// If source code dir does not exist use install target prefix as system dir
else
#endif
if (system::exists(CARDINAL_PLUGIN_PREFIX "/share/cardinal"))
{
asset::bundlePath = CARDINAL_PLUGIN_PREFIX "/share/cardinal/PluginManifests";
#if defined(ARCH_MAC)
asset::systemDir = "/Library/Application Support/Cardinal";
#elif defined(ARCH_WIN)
if (const char* const commonprogfiles = std::getenv("COMMONPROGRAMFILES"))
asset::systemDir = system::join(commonprogfiles, "Cardinal");
#else
asset::systemDir = CARDINAL_PLUGIN_PREFIX "/share/cardinal";
templatePath = system::join(asset::systemDir, "template.vcv");
#endif
if (! asset::systemDir.empty())
{
asset::bundlePath = system::join(asset::systemDir, "PluginManifests");
templatePath = system::join(asset::systemDir, "template.vcv");
}
}
}


+ 1
- 1
src/override/common.cpp View File

@@ -53,7 +53,7 @@ const std::string APP_VERSION_MAJOR = "2";
const std::string APP_VERSION = "2.1";
#if defined ARCH_WIN
const std::string APP_OS = "win";
#elif ARCH_MAC
#elif defined ARCH_MAC
const std::string APP_OS = "mac";
#elif defined ARCH_LIN
const std::string APP_OS = "lin";


Loading…
Cancel
Save