diff --git a/SourceSampler/Builds/ELKAudioOS/Makefile b/SourceSampler/Builds/ELKAudioOS/Makefile index 9ed9501..f3811b1 100644 --- a/SourceSampler/Builds/ELKAudioOS/Makefile +++ b/SourceSampler/Builds/ELKAudioOS/Makefile @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DASIO_STANDALONE=1" "-DJUCER_LINUX_MAKE_84E12380=1" "-DJUCE_APP_VERSION=0.6" "-DJUCE_APP_VERSION_HEX=0x600" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I$(HOME)/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I/code/VST2_SDK -I../../JuceLibraryCode -I$(HOME)/JUCE/modules -I/workdir/sysroots/aarch64-elk-linux/usr/include/freetype2/ -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ -I../../3rdParty/Simple-WebSocket-Server/ -I../../3rdParty/Simple-Web-Server/ -I../../3rdParty/asio/asio/include/ $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DASIO_STANDALONE=1" "-DJUCER_LINUX_MAKE_84E12380=1" "-DJUCE_APP_VERSION=0.6" "-DJUCE_APP_VERSION_HEX=0x600" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I$(HOME)/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I/code/VST2_SDK -I../../JuceLibraryCode -I$(HOME)/JUCE/modules -I/workdir/sysroots/aarch64-elk-linux/usr/include/freetype2/ -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ -I../../3rdParty/Simple-WebSocket-Server/ -I../../3rdParty/Simple-Web-Server/ -I../../3rdParty/asio/asio/include/ -I../../Source/common/ $(CPPFLAGS) JUCE_CPPFLAGS_VST := "-DJucePlugin_Build_VST=1" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden @@ -77,7 +77,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DASIO_STANDALONE=1" "-DJUCER_LINUX_MAKE_84E12380=1" "-DJUCE_APP_VERSION=0.6" "-DJUCE_APP_VERSION_HEX=0x600" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I$(HOME)/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I/code/VST2_SDK -I../../JuceLibraryCode -I$(HOME)/JUCE/modules -I/workdir/sysroots/aarch64-elk-linux/usr/include/freetype2/ -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ -I../../3rdParty/Simple-WebSocket-Server/ -I../../3rdParty/Simple-Web-Server/ -I../../3rdParty/asio/asio/include/ $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DASIO_STANDALONE=1" "-DJUCER_LINUX_MAKE_84E12380=1" "-DJUCE_APP_VERSION=0.6" "-DJUCE_APP_VERSION_HEX=0x600" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I$(HOME)/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I/code/VST2_SDK -I../../JuceLibraryCode -I$(HOME)/JUCE/modules -I/workdir/sysroots/aarch64-elk-linux/usr/include/freetype2/ -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ -I../../3rdParty/Simple-WebSocket-Server/ -I../../3rdParty/Simple-Web-Server/ -I../../3rdParty/asio/asio/include/ -I../../Source/common/ $(CPPFLAGS) JUCE_CPPFLAGS_VST := "-DJucePlugin_Build_VST=1" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden diff --git a/SourceSampler/Builds/LinuxMakefile/Makefile b/SourceSampler/Builds/LinuxMakefile/Makefile index 012eb58..1b7078f 100644 --- a/SourceSampler/Builds/LinuxMakefile/Makefile +++ b/SourceSampler/Builds/LinuxMakefile/Makefile @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DASIO_STANDALONE=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=0.6" "-DJUCE_APP_VERSION_HEX=0x600" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../../../VST_SDK/VST2_SDK -I../../JuceLibraryCode -I../../3rdParty/JUCE/modules -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ -I../../3rdParty/Simple-WebSocket-Server/ -I../../3rdParty/Simple-Web-Server/ -I../../3rdParty/asio/asio/include/ $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DASIO_STANDALONE=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=0.6" "-DJUCE_APP_VERSION_HEX=0x600" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../../../VST_SDK/VST2_SDK -I../../JuceLibraryCode -I../../3rdParty/JUCE/modules -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ -I../../3rdParty/Simple-WebSocket-Server/ -I../../3rdParty/Simple-Web-Server/ -I../../3rdParty/asio/asio/include/ -I../../Source/common/ $(CPPFLAGS) JUCE_CPPFLAGS_VST := "-DJucePlugin_Build_VST=1" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden @@ -77,7 +77,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DASIO_STANDALONE=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=0.6" "-DJUCE_APP_VERSION_HEX=0x600" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../../../VST_SDK/VST2_SDK -I../../JuceLibraryCode -I../../3rdParty/JUCE/modules -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ -I../../3rdParty/Simple-WebSocket-Server/ -I../../3rdParty/Simple-Web-Server/ -I../../3rdParty/asio/asio/include/ $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DASIO_STANDALONE=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=0.6" "-DJUCE_APP_VERSION_HEX=0x600" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../../../VST_SDK/VST2_SDK -I../../JuceLibraryCode -I../../3rdParty/JUCE/modules -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ -I../../3rdParty/Simple-WebSocket-Server/ -I../../3rdParty/Simple-Web-Server/ -I../../3rdParty/asio/asio/include/ -I../../Source/common/ $(CPPFLAGS) JUCE_CPPFLAGS_VST := "-DJucePlugin_Build_VST=1" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden diff --git a/SourceSampler/Builds/MacOSX/SourceSampler.xcodeproj/project.pbxproj b/SourceSampler/Builds/MacOSX/SourceSampler.xcodeproj/project.pbxproj index 5fe4300..e25f62b 100644 --- a/SourceSampler/Builds/MacOSX/SourceSampler.xcodeproj/project.pbxproj +++ b/SourceSampler/Builds/MacOSX/SourceSampler.xcodeproj/project.pbxproj @@ -91,6 +91,7 @@ 0C636102DF04538D9FF9ADB2 /* include_juce_audio_utils.mm */ /* include_juce_audio_utils.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_audio_utils.mm; path = ../../JuceLibraryCode/include_juce_audio_utils.mm; sourceTree = SOURCE_ROOT; }; 129B2FA0A9E3ECEE9589F0CA /* Cocoa.framework */ /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 160F33129C21F39682D768BC /* Info-AU.plist */ /* Info-AU.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AU.plist"; path = "Info-AU.plist"; sourceTree = SOURCE_ROOT; }; + 1A8A4277B5B42AC4D7977AA2 /* drow_ValueTreeObjectList.h */ /* drow_ValueTreeObjectList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = drow_ValueTreeObjectList.h; path = ../../Source/common/drow_ValueTreeObjectList.h; sourceTree = SOURCE_ROOT; }; 1D60E7D5B1EF58ED10B71F7D /* xenomai_stubs.h */ /* xenomai_stubs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = xenomai_stubs.h; path = ../../3rdParty/twine/src/xenomai_stubs.h; sourceTree = SOURCE_ROOT; }; 1DEE04B05B79DF8EA3A9E5DD /* include_juce_dsp.mm */ /* include_juce_dsp.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_dsp.mm; path = ../../JuceLibraryCode/include_juce_dsp.mm; sourceTree = SOURCE_ROOT; }; 231731DB1E7A71CF246DF02C /* SourceSamplerSynthesiser.h */ /* SourceSamplerSynthesiser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SourceSamplerSynthesiser.h; path = ../../Source/SourceSamplerSynthesiser.h; sourceTree = SOURCE_ROOT; }; @@ -135,7 +136,6 @@ 7EA54F98BDA2739089629A6C /* include_juce_gui_extra.mm */ /* include_juce_gui_extra.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_gui_extra.mm; path = ../../JuceLibraryCode/include_juce_gui_extra.mm; sourceTree = SOURCE_ROOT; }; 81C399931B0DB13A690E16D7 /* SourceSampler.cpp */ /* SourceSampler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SourceSampler.cpp; path = ../../Source/SourceSampler.cpp; sourceTree = SOURCE_ROOT; }; 8399535889E4E09A2BCE7015 /* QuartzCore.framework */ /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 8486F824FD97661FF5C053EE /* drow_ValueTreeObjectList.h */ /* drow_ValueTreeObjectList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = drow_ValueTreeObjectList.h; path = ../../Source/drow_ValueTreeObjectList.h; sourceTree = SOURCE_ROOT; }; 852695CCF020E7741DFB5239 /* LevelMeterSource.h */ /* LevelMeterSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LevelMeterSource.h; path = ../../3rdParty/ff_meters/LevelMeter/LevelMeterSource.h; sourceTree = SOURCE_ROOT; }; 8A9786F9B4B67D81403D0B29 /* juce_audio_formats */ /* juce_audio_formats */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_audio_formats; path = ../../3rdParty/JUCE/modules/juce_audio_formats; sourceTree = SOURCE_ROOT; }; 8A9B9D84270C0D541733DDAC /* juce_data_structures */ /* juce_data_structures */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_data_structures; path = ../../3rdParty/JUCE/modules/juce_data_structures; sourceTree = SOURCE_ROOT; }; @@ -396,7 +396,7 @@ B51DEA0DCE7EF3E63BCF7044 /* Other */ = { isa = PBXGroup; children = ( - 8486F824FD97661FF5C053EE, + 1A8A4277B5B42AC4D7977AA2, 9A72388A5D6940CDD807D379, A2685F1639A6FDB636BE458D, 852695CCF020E7741DFB5239, @@ -1007,6 +1007,7 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); @@ -1016,7 +1017,7 @@ LIBRARY_STYLE = Bundle; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-bundle -lSourceSampler -L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1165,6 +1166,7 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); @@ -1172,7 +1174,7 @@ INFOPLIST_PREPROCESS = NO; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-lSourceSampler -L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1225,13 +1227,14 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); INSTALL_PATH = "@executable_path/../Frameworks"; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1287,6 +1290,7 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); @@ -1295,7 +1299,7 @@ INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-bundle -lSourceSampler -L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1351,6 +1355,7 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); @@ -1359,7 +1364,7 @@ INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-bundle -lSourceSampler -L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1416,6 +1421,7 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); @@ -1424,7 +1430,7 @@ INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-bundle -lSourceSampler -L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1480,6 +1486,7 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); @@ -1489,7 +1496,7 @@ LIBRARY_STYLE = Bundle; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-bundle -lSourceSampler -L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1552,12 +1559,13 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1610,13 +1618,14 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); INFOPLIST_FILE = Info-Standalone_Plugin.plist; INFOPLIST_PREPROCESS = NO; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-lSourceSampler -L/usr/local/opt/openssl/lib -lssl -lcrypto"; @@ -1679,6 +1688,7 @@ "$(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/", "$(SRCROOT)/../../3rdParty/Simple-Web-Server/", "$(SRCROOT)/../../3rdParty/asio/asio/include/", + "$(SRCROOT)/../../Source/common/", "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client", "$(inherited)", ); @@ -1688,7 +1698,7 @@ LIBRARY_STYLE = Bundle; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; + MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK $(SRCROOT)/../../../../VST_SDK/VST2_SDK $(SRCROOT)/../../JuceLibraryCode $(SRCROOT)/../../3rdParty/JUCE/modules $(SRCROOT)/../../3rdParty/ff_meters/LevelMeter/ $(SRCROOT)/../../3rdParty/twine/include/ $(SRCROOT)/../../3rdParty/Simple-WebSocket-Server/ $(SRCROOT)/../../3rdParty/Simple-Web-Server/ $(SRCROOT)/../../3rdParty/asio/asio/include/ $(SRCROOT)/../../Source/common/ $(SRCROOT)/../../3rdParty/JUCE/modules/juce_audio_plugin_client"; OTHER_CFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_CPLUSPLUSFLAGS = "-DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include"; OTHER_LDFLAGS = "-bundle -lSourceSampler -L/usr/local/opt/openssl/lib -lssl -lcrypto"; diff --git a/SourceSampler/Source/drow_ValueTreeObjectList.h b/SourceSampler/Source/common/drow_ValueTreeObjectList.h similarity index 100% rename from SourceSampler/Source/drow_ValueTreeObjectList.h rename to SourceSampler/Source/common/drow_ValueTreeObjectList.h diff --git a/SourceSampler/SourceSampler.jucer b/SourceSampler/SourceSampler.jucer index 8f87230..acc3130 100644 --- a/SourceSampler/SourceSampler.jucer +++ b/SourceSampler/SourceSampler.jucer @@ -5,7 +5,7 @@ companyWebsite="http://mtg.upf.edu" companyEmail="frederic.font@upf.edu" reportAppUsage="0" pluginFormats="buildAU,buildStandalone,buildVST,buildVST3" pluginCharacteristicsValue="pluginIsSynth,pluginProducesMidiOut,pluginWantsMidiIn" - pluginManufacturerCode="RaAu" pluginCode="SoSa" headerPath="../../3rdParty/ff_meters/LevelMeter/ ../../3rdParty/twine/include/ ../../3rdParty/Simple-WebSocket-Server/ ../../3rdParty/Simple-Web-Server/ ../../3rdParty/asio/asio/include/" + pluginManufacturerCode="RaAu" pluginCode="SoSa" headerPath="../../3rdParty/ff_meters/LevelMeter/ ../../3rdParty/twine/include/ ../../3rdParty/Simple-WebSocket-Server/ ../../3rdParty/Simple-Web-Server/ ../../3rdParty/asio/asio/include/ ../../Source/common/" jucerFormatVersion="1" bundleIdentifier="com.RitaAurora.SourceSampler" defines="ASIO_STANDALONE=1" addUsingNamespaceToJuceHeader="0"> @@ -40,8 +40,8 @@ file="Source/SourceSamplerVoice.h"/> - +