Browse Source

Use carla-bridge-native.exe for native arch bridge on windows

tags/v2.3.0-RC1
falkTX 3 years ago
parent
commit
1e7c7dc4bd
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 16 additions and 7 deletions
  1. +8
    -0
      source/backend/engine/CarlaEngine.cpp
  2. +8
    -7
      source/bridges-plugin/CarlaBridgePlugin.cpp

+ 8
- 0
source/backend/engine/CarlaEngine.cpp View File

@@ -552,10 +552,18 @@ bool CarlaEngine::addPlugin(const BinaryType btype,
bridgeBinary += CARLA_OS_SEP_STR "carla-bridge-posix64";
break;
case BINARY_WIN32:
#if BINARY_NATIVE == BINARY_WIN32
bridgeBinary += CARLA_OS_SEP_STR "carla-bridge-native.exe";
#else
bridgeBinary += CARLA_OS_SEP_STR "carla-bridge-win32.exe";
#endif
break;
case BINARY_WIN64:
#if BINARY_NATIVE == BINARY_WIN64
bridgeBinary += CARLA_OS_SEP_STR "carla-bridge-native.exe";
#else
bridgeBinary += CARLA_OS_SEP_STR "carla-bridge-win64.exe";
#endif
break;
default:
bridgeBinary.clear();


+ 8
- 7
source/bridges-plugin/CarlaBridgePlugin.cpp View File

@@ -283,13 +283,6 @@ public:
}

gIsInitiated = true;
int64_t timeToEnd = 0;

if (testing)
{
timeToEnd = water::Time::currentTimeMillis() + 5 * 1000;
fEngine->transportPlay();
}

#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
# ifndef CARLA_OS_WIN
@@ -299,6 +292,14 @@ public:
juce::JUCEApplicationBase::createInstance = &juce_CreateApplication;
juce::JUCEApplicationBase::main(JUCE_MAIN_FUNCTION_ARGS);
#else
int64_t timeToEnd = 0;

if (testing)
{
timeToEnd = water::Time::currentTimeMillis() + 5 * 1000;
fEngine->transportPlay();
}

for (; runMainLoopOnce() && ! gCloseNow;)
{
gIdle();


Loading…
Cancel
Save