Browse Source

Fix windows build

tags/1.9.6
falkTX 11 years ago
parent
commit
ed507ee0e7
4 changed files with 13 additions and 12 deletions
  1. +3
    -3
      source/backend/plugin/CarlaPluginJuce.cpp
  2. +1
    -1
      source/bridges-plugin/Makefile
  3. +5
    -4
      source/modules/jackbridge/JackBridgeExport.cpp
  4. +4
    -4
      source/utils/CarlaPipeUtils.cpp

+ 3
- 3
source/backend/plugin/CarlaPluginJuce.cpp View File

@@ -22,7 +22,7 @@

#include "CarlaBackendUtils.hpp"
#include "CarlaMathUtils.hpp"
#include "CarlaPluginJuceWindow.hpp"
#include "JucePluginWindow.hpp"

#include "juce_audio_processors.h"

@@ -302,7 +302,7 @@ public:
String uiName(pData->name);
uiName += " (GUI)";

fWindow = new CarlaPluginJuceWindow();
fWindow = new JucePluginWindow();
fWindow->setName(uiName);
}

@@ -1249,7 +1249,7 @@ private:

const char* fUniqueId;

ScopedPointer<CarlaPluginJuceWindow> fWindow;
ScopedPointer<JucePluginWindow> fWindow;

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaPluginJuce)
};


+ 1
- 1
source/bridges-plugin/Makefile View File

@@ -39,7 +39,7 @@ LIBS_native = $(MODULEDIR)/jackbridge.a
LIBS_posix32 = $(MODULEDIR)/jackbridge.posix32.a
LIBS_posix64 = $(MODULEDIR)/jackbridge.posix64.a
LIBS_win32 = $(MODULEDIR)/jackbridge.win32e.a
LIBS_win64 = $(MODULEDIR)/jackbridge.win364e.a
LIBS_win64 = $(MODULEDIR)/jackbridge.win64e.a
LINK_FLAGS += $(JACKBRIDGE_LIBS)

LIBS_native += $(MODULEDIR)/juce_audio_basics.a


+ 5
- 4
source/modules/jackbridge/JackBridgeExport.cpp View File

@@ -42,6 +42,7 @@ public:
{
if (lib == nullptr)
return;

lib_close(lib);
lib = nullptr;
func = nullptr;
@@ -66,7 +67,7 @@ public:
}

private:
void* lib;
lib_t lib;
jackbridge_exported_function_type func;

CARLA_PREVENT_HEAP_ALLOCATION
@@ -529,9 +530,9 @@ bool jackbridge_sem_init(void* sem) noexcept
return getBridgeInstance().sem_init_ptr(sem);
}

bool jackbridge_sem_destroy(void* sem) noexcept
void jackbridge_sem_destroy(void* sem) noexcept
{
return getBridgeInstance().sem_destroy_ptr(sem);
getBridgeInstance().sem_destroy_ptr(sem);
}

bool jackbridge_sem_post(void* sem) noexcept
@@ -539,7 +540,7 @@ bool jackbridge_sem_post(void* sem) noexcept
return getBridgeInstance().sem_post_ptr(sem);
}

bool jackbridge_sem_timedwait(void* sem, int secs) noexcept
bool jackbridge_sem_timedwait(void* sem, uint secs) noexcept
{
return getBridgeInstance().sem_timedwait_ptr(sem, secs);
}


+ 4
- 4
source/utils/CarlaPipeUtils.cpp View File

@@ -1195,10 +1195,10 @@ bool CarlaPipeClient::init(const char* argv[]) noexcept
// read arguments

#ifdef CARLA_OS_WIN
HANDLE pipeRecvServer = (HANDLE)std::atol(argv[3]); // READ
HANDLE pipeRecvClient = (HANDLE)std::atol(argv[4]);
HANDLE pipeSendServer = (HANDLE)std::atol(argv[5]); // SEND
HANDLE pipeSendClient = (HANDLE)std::atol(argv[6]);
HANDLE pipeRecvServer = (HANDLE)std::atoll(argv[3]); // READ
HANDLE pipeRecvClient = (HANDLE)std::atoll(argv[4]);
HANDLE pipeSendServer = (HANDLE)std::atoll(argv[5]); // SEND
HANDLE pipeSendClient = (HANDLE)std::atoll(argv[6]);

CARLA_SAFE_ASSERT_RETURN(pipeRecvServer != INVALID_HANDLE_VALUE, false);
CARLA_SAFE_ASSERT_RETURN(pipeRecvClient != INVALID_HANDLE_VALUE, false);


Loading…
Cancel
Save