Merge remote-tracking branch 'origin/main' into cpumeter

templates/lv2-make/Makefile

@@ -52,10 +52,10 @@ DATA_DIR := $(or $(DATA_DIR),.)
 PLUGIN_DIR := $(or $(PLUGIN_DIR),src)
 
 CFLAGS := -O3 -Wall -Wpedantic -Wextra
-CFLAGS_ALL := -I$(DATA_DIR)/src -I$(PLUGIN_DIR) -fPIC $(CFLAGS) $(CFLAGS_EXTRA)
+CFLAGS_ALL := -I$(DATA_DIR)/src -I$(PLUGIN_DIR) $(shell pkg-config --cflags lv2) -fPIC $(CFLAGS) $(CFLAGS_EXTRA)
 
 LDFLAGS :=
-LDFLAGS_ALL := -shared $(LDFLAGS) $(LDFLAGS_EXTRA)
+LDFLAGS_ALL := -shared $(shell pkg-config --libs lv2) $(LDFLAGS) $(LDFLAGS_EXTRA)
 
 CXXFLAGS := $(CFLAGS)
 CXXFLAGS_ALL := -I$(DATA_DIR)/src -I$(PLUGIN_DIR) -fPIC $(CXXFLAGS) $(CXXFLAGS_EXTRA)

templates/vst3/src/vst3.c

@@ -58,6 +58,9 @@ typedef struct {
 #else
 # include <dlfcn.h>
 #endif
+#ifdef __APPLE__
+# include <CoreFoundation/CoreFoundation.h>
+#endif
 
 #if defined(__i386__) || defined(__x86_64__)
 #include <xmmintrin.h>
@@ -1017,7 +1020,6 @@ static Steinberg_ITimerHandlerVtbl timerHandlerVtblITimerHandler = {
 
 # elif defined(__APPLE__)
 
-#  include <CoreFoundation/CoreFoundation.h>
 #  include <objc/objc.h>
 #  include <objc/runtime.h>
 #  include <objc/message.h>