Skip to content

Commit

Permalink
Updated to JUCE v6.0.1.
Browse files Browse the repository at this point in the history
Added NRPN, RPN and 14-bit CC MIDI features.
  • Loading branch information
gbevin committed Sep 9, 2020
1 parent c998fb4 commit 30aebf4
Show file tree
Hide file tree
Showing 561 changed files with 34,855 additions and 7,670 deletions.
22 changes: 14 additions & 8 deletions Builds/LinuxMakefile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ ifeq ($(CONFIG),Debug)
JUCE_OUTDIR := build

ifeq ($(TARGET_ARCH),)
TARGET_ARCH := -march=native
TARGET_ARCH :=
endif

JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.1.0 -DJUCE_APP_VERSION_HEX=0x10100 $(shell pkg-config --cflags alsa libcurl) -pthread -I../../JuceLibraryCode -I../../JuceLibraryCode/modules $(CPPFLAGS)
JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -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_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.1.0" "-DJUCE_APP_VERSION_HEX=0x10100" $(shell pkg-config --cflags alsa) -pthread -I../../JuceLibraryCode -I../../JuceLibraryCode/modules $(CPPFLAGS)
JUCE_CPPFLAGS_CONSOLEAPP := "-DJucePlugin_Build_VST=0" "-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_TARGET_CONSOLEAPP := receivemidi

JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS)
JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++14 $(CXXFLAGS)
JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa libcurl) -ldl -lpthread -lrt $(LDFLAGS)
JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS)

CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
endif
Expand All @@ -56,19 +56,20 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH :=
endif

JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.1.0 -DJUCE_APP_VERSION_HEX=0x10100 $(shell pkg-config --cflags alsa libcurl) -pthread -I../../JuceLibraryCode -I../../JuceLibraryCode/modules $(CPPFLAGS)
JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -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_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.1.0" "-DJUCE_APP_VERSION_HEX=0x10100" $(shell pkg-config --cflags alsa) -pthread -I../../JuceLibraryCode -I../../JuceLibraryCode/modules $(CPPFLAGS)
JUCE_CPPFLAGS_CONSOLEAPP := "-DJucePlugin_Build_VST=0" "-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_TARGET_CONSOLEAPP := receivemidi

JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS)
JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++14 $(CXXFLAGS)
JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa libcurl) -fvisibility=hidden -ldl -lpthread -lrt $(LDFLAGS)
JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS)

CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
endif

OBJECTS_CONSOLEAPP := \
$(JUCE_OBJDIR)/Main_90ebc5c2.o \
$(JUCE_OBJDIR)/MidiRPN_a0a26bf0.o \
$(JUCE_OBJDIR)/ScriptMidiMessageClass_6b9b1366.o \
$(JUCE_OBJDIR)/ScriptOscClass_a57c652d.o \
$(JUCE_OBJDIR)/ScriptUtilClass_492e64ec.o \
Expand All @@ -85,7 +86,7 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_CONSOLEAPP)

$(JUCE_OUTDIR)/$(JUCE_TARGET_CONSOLEAPP) : $(OBJECTS_CONSOLEAPP) $(RESOURCES)
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa libcurl
@pkg-config --print-errors alsa
@echo Linking "receivemidi - ConsoleApp"
-$(V_AT)mkdir -p $(JUCE_BINDIR)
-$(V_AT)mkdir -p $(JUCE_LIBDIR)
Expand All @@ -97,6 +98,11 @@ $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp
@echo "Compiling Main.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_CONSOLEAPP) $(JUCE_CFLAGS_CONSOLEAPP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/MidiRPN_a0a26bf0.o: ../../Source/MidiRPN.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling MidiRPN.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_CONSOLEAPP) $(JUCE_CFLAGS_CONSOLEAPP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/ScriptMidiMessageClass_6b9b1366.o: ../../Source/ScriptMidiMessageClass.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling ScriptMidiMessageClass.cpp"
Expand Down
6 changes: 6 additions & 0 deletions Builds/MacOSX/receivemidi.entitlements
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
</dict>
</plist>
43 changes: 34 additions & 9 deletions Builds/MacOSX/receivemidi.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
isa = PBXBuildFile;
fileRef = B2451D1DBA700503A8FEDC18;
};
6EA0E7FEF85943B1DFF916B3 = {
isa = PBXBuildFile;
fileRef = 533259100534FB3D63540B5C;
};
733F39336A3BA81575DD317E = {
isa = PBXBuildFile;
fileRef = 3973848B1FB155637755C9F9;
Expand Down Expand Up @@ -126,6 +130,13 @@
path = "../../JuceLibraryCode/include_juce_osc.cpp";
sourceTree = "SOURCE_ROOT";
};
533259100534FB3D63540B5C = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.cpp;
name = MidiRPN.cpp;
path = ../../Source/MidiRPN.cpp;
sourceTree = "SOURCE_ROOT";
};
5D3F4C219DB9D465708B6231 = {
isa = PBXFileReference;
lastKnownFileType = wrapper.framework;
Expand Down Expand Up @@ -182,6 +193,13 @@
path = receivemidi;
sourceTree = "BUILT_PRODUCTS_DIR";
};
97C0FA3EF81821C75C9D8CFD = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = MidiRPN.h;
path = ../../Source/MidiRPN.h;
sourceTree = "SOURCE_ROOT";
};
9CD2954B59A33B0796DD0778 = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
Expand Down Expand Up @@ -284,6 +302,8 @@
isa = PBXGroup;
children = (
B2451D1DBA700503A8FEDC18,
533259100534FB3D63540B5C,
97C0FA3EF81821C75C9D8CFD,
3973848B1FB155637755C9F9,
C70C6063AC097C5848BB449E,
7113DF850C738FF287669BA9,
Expand Down Expand Up @@ -378,6 +398,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
Expand Down Expand Up @@ -405,7 +426,7 @@
"$(inherited)",
);
INSTALL_PATH = "/usr/bin";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = com.uwyn.receivemidi;
PRODUCT_NAME = "receivemidi";
USE_HEADERMAP = NO;
Expand All @@ -418,6 +439,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
DEAD_CODE_STRIPPING = YES;
Expand All @@ -438,7 +460,6 @@
"JucePlugin_Build_Standalone=0",
"JucePlugin_Build_Unity=0",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
"../../JuceLibraryCode",
Expand All @@ -447,7 +468,7 @@
);
INSTALL_PATH = "/usr/bin";
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = com.uwyn.receivemidi;
PRODUCT_NAME = "receivemidi";
USE_HEADERMAP = NO;
Expand Down Expand Up @@ -476,13 +497,15 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_TESTABILITY = NO;
GCC_C_LANGUAGE_STANDARD = c11;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_MODEL_TUNING = G5;
GCC_NO_COMMON_BLOCKS = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
Expand All @@ -495,6 +518,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "receivemidi";
SDKROOT = macosx;
WARNING_CFLAGS = "-Wreorder";
ZERO_LINK = NO;
};
Expand Down Expand Up @@ -522,12 +546,15 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = NO;
GCC_C_LANGUAGE_STANDARD = c11;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_MODEL_TUNING = G5;
GCC_NO_COMMON_BLOCKS = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
Expand All @@ -539,15 +566,12 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PRODUCT_NAME = "receivemidi";
SDKROOT = macosx;
WARNING_CFLAGS = "-Wreorder";
ZERO_LINK = NO;
};
name = Release;
};
051CE20F6F4544DC5B59EC97 = {
isa = PBXTargetDependency;
target = DBA0A682EFBA8D17289648F9;
};
9B7F79ECBA6BB3FD7D9F4A1B = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down Expand Up @@ -579,6 +603,7 @@
buildActionMask = 2147483647;
files = (
2BA07F2CF2B004870E08CD28,
6EA0E7FEF85943B1DFF916B3,
733F39336A3BA81575DD317E,
39B2279B8530BBC87FA033F9,
141F7CB00D1F92A017A030DD,
Expand Down Expand Up @@ -622,7 +647,7 @@
6323F87A9BE44E1C4257AD90 = {
isa = PBXProject;
buildConfigurationList = 9B7F79ECBA6BB3FD7D9F4A1B;
attributes = { LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Uwyn"; };
attributes = { LastUpgradeCheck = 1100; ORGANIZATIONNAME = "Uwyn"; };
compatibilityVersion = "Xcode 3.2";
hasScannedForEncodings = 0;
mainGroup = CA1CE00FEEC53FB42E8CDD06;
Expand Down
Loading

0 comments on commit 30aebf4

Please sign in to comment.