More of the same

source/Makefile.mk

@@ -240,7 +240,7 @@ ifeq ($(MACOS),true)
 DGL_LIBS                = -framework OpenGL -framework Cocoa
 JACKBRIDGE_LIBS         = -ldl -lpthread
 JUCE_AUDIO_BASICS_LIBS  = -framework Accelerate
-JUCE_AUDIO_DEVICES_LIBS = -framework CoreAudio -framework CoreMIDI -framework DiscRecording
+JUCE_AUDIO_DEVICES_LIBS = -framework AudioToolbox -framework CoreAudio -framework CoreMIDI -framework DiscRecording
 JUCE_AUDIO_FORMATS_LIBS = -framework CoreAudio -framework CoreMIDI -framework QuartzCore -framework AudioToolbox
 JUCE_CORE_LIBS          = -framework Cocoa -framework IOKit
 JUCE_GRAPHICS_LIBS      = -framework Cocoa -framework QuartzCore

source/backend/standalone/Makefile

@@ -124,7 +124,7 @@ debug:
 	$(CXX) $< -Wl,--start-group $(STATIC_LIBS) -Wl,--end-group $(LINK_FLAGS) -shared -Wl,--output-def,$@.def -o $@
 
 ../libcarla_standalone2.dylib: CarlaStandalone.cpp.o $(STATIC_LIBS)
-	$(CXX) $< -Wl,--start-group $(STATIC_LIBS) -Wl,--end-group $(LINK_FLAGS) -dynamiclib -o $@
+	$(CXX) $< $(STATIC_LIBS) $(LINK_FLAGS) -dynamiclib -o $@
 
 ../libcarla_standalone2.so: CarlaStandalone.cpp.o $(STATIC_LIBS)
 	$(CXX) $< -Wl,--start-group $(STATIC_LIBS) -Wl,--end-group $(LINK_FLAGS) -shared -o $@

source/modules/juce_graphics/native/juce_mac_Fonts.mm

@@ -31,13 +31,13 @@ const float referenceFontSize = 1024.0f;
 
 #if JUCE_CORETEXT_AVAILABLE
 
-#if JUCE_MAC && MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_5
+//#if JUCE_MAC && MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_5
 extern "C"
 {
     void CTRunGetAdvances (CTRunRef, CFRange, CGSize buffer[]);
     const CGSize* CTRunGetAdvancesPtr (CTRunRef);
 }
-#endif
+//#endif
 
 static CTFontRef getCTFontFromTypeface (const Font& f);
 
@@ -626,7 +626,7 @@ StringArray Font::findAllTypefaceNames()
 {
     StringArray names;
 
-   #if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5 && ! JUCE_IOS
+   #if 0 //MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5 && ! JUCE_IOS
     // CTFontManager only exists on OS X 10.6 and later, it does not exist on iOS
     CFArrayRef fontFamilyArray = CTFontManagerCopyAvailableFontFamilyNames();
 

source/plugin/Makefile

@@ -165,7 +165,7 @@ carla-native.lv2/carla-native.dll: carla-native-lv2.cpp.o $(LIBS)
 	$(CXX) $< -Wl,--start-group $(LIBS) -Wl,--end-group -shared $(LINK_FLAGS) -o $@
 
 carla-native.lv2/carla-native.dylib: carla-native-lv2.cpp.o $(LIBS)
-	$(CXX) $< -Wl,--start-group $(LIBS) -Wl,--end-group -dynamiclib $(LINK_FLAGS) -o $@
+	$(CXX) $< $(LIBS) -dynamiclib $(LINK_FLAGS) -o $@
 
 carla-native.lv2/carla-native.so: carla-native-lv2.cpp.o $(LIBS)
 	$(CXX) $< -Wl,--start-group $(LIBS) -Wl,--end-group -shared $(LINK_FLAGS) -o $@

source/plugin/carla-native-lv2.cpp

@@ -1415,7 +1415,7 @@ const LV2_Descriptor* lv2_descriptor(uint32_t index)
 
     carla_debug("lv2_descriptor(%i) - not found, allocating new with uri \"%s\"", index, (const char*)tmpURI);
 
-    const LV2_Descriptor* const lv2Desc(new const LV2_Descriptor{
+    const LV2_Descriptor lv2DescTmp = {
     /* URI            */ carla_strdup(tmpURI),
     /* instantiate    */ lv2_instantiate,
     /* connect_port   */ lv2_connect_port,
@@ -1424,7 +1424,10 @@ const LV2_Descriptor* lv2_descriptor(uint32_t index)
     /* deactivate     */ lv2_deactivate,
     /* cleanup        */ lv2_cleanup,
     /* extension_data */ lv2_extension_data
-    });
+    };
+
+    LV2_Descriptor* const lv2Desc(new LV2_Descriptor);
+    std::memcpy(lv2Desc, &lv2DescTmp, sizeof(LV2_Descriptor));
 
     plm.lv2Descs.append(lv2Desc);