Browse Source

Fix OSX build

tags/1.9.4
falkTX 10 years ago
parent
commit
47e6ab8ee4
3 changed files with 6 additions and 2 deletions
  1. +1
    -1
      source/modules/juce_data_structures/Makefile
  2. +3
    -1
      source/modules/native-plugins/zynaddsubfx-synth.cpp
  3. +2
    -0
      source/plugin/carla-native-lv2.cpp

+ 1
- 1
source/modules/juce_data_structures/Makefile View File

@@ -77,7 +77,7 @@ juce_data_structures.cpp.%64.o: $(CPP_DEPS)

# --------------------------------------------------------------

MM_DEPS = juce_data_structures.mm juce_data_structures.h AppConfig.h */*.cpp */*.h
MM_DEPS = juce_data_structures.cpp juce_data_structures.h AppConfig.h */*.cpp */*.h

juce_data_structures.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 3
- 1
source/modules/native-plugins/zynaddsubfx-synth.cpp View File

@@ -78,7 +78,9 @@ class ZynAddSubFxPrograms
public:
ZynAddSubFxPrograms()
: fInitiated(false),
#ifdef CARLA_PROPER_CPP11_SUPPORT
fRetProgram({0, 0, nullptr}),
#endif
fPrograms() {}

~ZynAddSubFxPrograms()
@@ -318,7 +320,7 @@ public:
void maybeReinit(const NativeHostDescriptor* const host)
{
if (host->get_buffer_size(host->handle) == static_cast<uint32_t>(synth->buffersize) &&
host->get_sample_rate(host->handle) == static_cast<double>(synth->samplerate))
carla_compareFloats(host->get_sample_rate(host->handle), static_cast<double>(synth->samplerate)))
return;

reinit(host);


+ 2
- 0
source/plugin/carla-native-lv2.cpp View File

@@ -72,7 +72,9 @@ public:
: fHandle(nullptr),
fHost(),
fDescriptor(desc),
#ifdef CARLA_PROPER_CPP11_SUPPORT
fProgramDesc({0, 0, nullptr}),
#endif
fMidiEventCount(0),
fTimeInfo(),
fIsProcessing(false),


Loading…
Cancel
Save