Skip to content

Commit

Permalink
Merge pull request #86 from pierreguillot/dev/v1.0.2
Browse files Browse the repository at this point in the history
v1.0.2
  • Loading branch information
pierreguillot authored Feb 8, 2018
2 parents 2ccfd32 + 52c7b9d commit 1a70eb6
Show file tree
Hide file tree
Showing 73 changed files with 6,288 additions and 5,868 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
*.component
*.vst
*.vst3
*.lv2

# Mac Xcode
*.xcuserstate
Expand All @@ -36,6 +37,11 @@
# Juce & ThirdParty
/Builds/MacOSX/build/
/Builds/LinuxMakefile/build/
/Builds/.backup/

#Examples
/Plugins/Examples/GuyMoquet/
/Plugins/Examples/*
!/Plugins/Examples/AlmondOrgan/
!/Plugins/Examples/Bulgroz/
!/Plugins/Examples/Castafiore/
!/Plugins/Examples/MiniMock/
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ matrix:
env: release=CamomileLinux64
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev
python-dev libfreetype6-dev libgtk-3-dev libcurl4-gnutls-dev alsa libasound2-dev
- sudo apt-get install -y libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev python-dev libfreetype6-dev libgtk-3-dev libcurl4-gnutls-dev alsa libasound2-dev
- sudo add-apt-repository -y ppa:webkit-team/ppa
- sudo apt-get -qq update
- sudo apt-get install -y libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev
Expand All @@ -37,8 +36,7 @@ matrix:
compiler: clang++
env: release=CamomileMacOS
script:
- xcodebuild -project libpd/libpd.xcodeproj -target libpd-osx-multi -configuration
Release ONLY_ACTIVE_ARCH=NO CONFIGURATION_BUILD_DIR="./libs" | egrep -A 5 "(error|warning):"
- xcodebuild -project libpd/libpd.xcodeproj -target libpd-osx-multi -configuration Release ONLY_ACTIVE_ARCH=NO CONFIGURATION_BUILD_DIR="./libs" | egrep -A 5 "(error|warning):"
- xcodebuild -project Builds/MacOSX/Camomile.xcodeproj -configuration Release
- xcodebuild -project Builds/MacOSX/Camomile.xcodeproj -configuration ReleaseFx
before_deploy:
Expand Down
58 changes: 29 additions & 29 deletions Builds/LinuxMakefile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native
endif

JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DHAVE_UNISTD_H=1 -DJucePlugin_IsSynth=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.1 -DJUCE_APP_VERSION_HEX=0x10001 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Juce/modules -I../../libpd/pure-data/src -I../../libpd/libpd_wrapper -I../../libpd/libpd_wrapper/util -I../../libpd/cpp $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DHAVE_UNISTD_H=1 -DJucePlugin_IsSynth=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.2 -DJUCE_APP_VERSION_HEX=0x10002 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Juce/modules -I../../libpd/pure-data/src -I../../libpd/libpd_wrapper -I../../libpd/libpd_wrapper/util -I../../libpd/cpp $(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
JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden
Expand All @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native
endif

JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DHAVE_UNISTD_H=1 -DJucePlugin_IsSynth=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.1 -DJUCE_APP_VERSION_HEX=0x10001 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Juce/modules -I../../libpd/pure-data/src -I../../libpd/libpd_wrapper -I../../libpd/libpd_wrapper/util -I../../libpd/cpp $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DHAVE_UNISTD_H=1 -DJucePlugin_IsSynth=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.2 -DJUCE_APP_VERSION_HEX=0x10002 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Juce/modules -I../../libpd/pure-data/src -I../../libpd/libpd_wrapper -I../../libpd/libpd_wrapper/util -I../../libpd/cpp $(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
JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden
Expand All @@ -87,7 +87,7 @@ ifeq ($(CONFIG),DebugFx)
TARGET_ARCH := -march=native
endif

JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DHAVE_UNISTD_H=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.1 -DJUCE_APP_VERSION_HEX=0x10001 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Juce/modules -I../../libpd/pure-data/src -I../../libpd/libpd_wrapper -I../../libpd/libpd_wrapper/util -I../../libpd/cpp $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DHAVE_UNISTD_H=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.2 -DJUCE_APP_VERSION_HEX=0x10002 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Juce/modules -I../../libpd/pure-data/src -I../../libpd/libpd_wrapper -I../../libpd/libpd_wrapper/util -I../../libpd/cpp $(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
JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden
Expand All @@ -114,7 +114,7 @@ ifeq ($(CONFIG),ReleaseFx)
TARGET_ARCH := -march=native
endif

JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DHAVE_UNISTD_H=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.1 -DJUCE_APP_VERSION_HEX=0x10001 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Juce/modules -I../../libpd/pure-data/src -I../../libpd/libpd_wrapper -I../../libpd/libpd_wrapper/util -I../../libpd/cpp $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DHAVE_UNISTD_H=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.2 -DJUCE_APP_VERSION_HEX=0x10002 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Juce/modules -I../../libpd/pure-data/src -I../../libpd/libpd_wrapper -I../../libpd/libpd_wrapper/util -I../../libpd/cpp $(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
JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden
Expand Down Expand Up @@ -142,15 +142,15 @@ OBJECTS_SHARED_CODE := \
$(JUCE_OBJDIR)/PluginParser_b8236cbb.o \
$(JUCE_OBJDIR)/PluginParameter_b51e717.o \
$(JUCE_OBJDIR)/PluginEditor_94d4fb09.o \
$(JUCE_OBJDIR)/PluginInformation_f27ac4da.o \
$(JUCE_OBJDIR)/PluginEditorInteraction_a14c4ad3.o \
$(JUCE_OBJDIR)/PluginEditorComponents_d5c3763f.o \
$(JUCE_OBJDIR)/PluginEditorConsole_e9a89d98.o \
$(JUCE_OBJDIR)/PluginEditorObject_217533e8.o \
$(JUCE_OBJDIR)/PluginLookAndFeel_c7d4572c.o \
$(JUCE_OBJDIR)/PdInstance_ddabcf25.o \
$(JUCE_OBJDIR)/PdPatch_69639a82.o \
$(JUCE_OBJDIR)/PdObject_b945538f.o \
$(JUCE_OBJDIR)/x_libpd_multi_1036951a.o \
$(JUCE_OBJDIR)/Gui_edc4c728.o \
$(JUCE_OBJDIR)/GuiConsole_79dfc099.o \
$(JUCE_OBJDIR)/GuiObject_aa3d2cc7.o \
$(JUCE_OBJDIR)/LookAndFeel_7fdda4eb.o \
$(JUCE_OBJDIR)/BinaryData_ce4232d4.o \
$(JUCE_OBJDIR)/include_juce_audio_basics_8a4e984a.o \
$(JUCE_OBJDIR)/include_juce_audio_devices_63111d02.o \
Expand Down Expand Up @@ -216,50 +216,50 @@ $(JUCE_OBJDIR)/PluginEditor_94d4fb09.o: ../../Source/PluginEditor.cpp
@echo "Compiling PluginEditor.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/PluginInformation_f27ac4da.o: ../../Source/PluginInformation.cpp
$(JUCE_OBJDIR)/PluginEditorInteraction_a14c4ad3.o: ../../Source/PluginEditorInteraction.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling PluginInformation.cpp"
@echo "Compiling PluginEditorInteraction.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/PdInstance_ddabcf25.o: ../../Source/Pd/PdInstance.cpp
$(JUCE_OBJDIR)/PluginEditorComponents_d5c3763f.o: ../../Source/PluginEditorComponents.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling PdInstance.cpp"
@echo "Compiling PluginEditorComponents.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/PdPatch_69639a82.o: ../../Source/Pd/PdPatch.cpp
$(JUCE_OBJDIR)/PluginEditorConsole_e9a89d98.o: ../../Source/PluginEditorConsole.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling PdPatch.cpp"
@echo "Compiling PluginEditorConsole.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/PdObject_b945538f.o: ../../Source/Pd/PdObject.cpp
$(JUCE_OBJDIR)/PluginEditorObject_217533e8.o: ../../Source/PluginEditorObject.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling PdObject.cpp"
@echo "Compiling PluginEditorObject.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/x_libpd_multi_1036951a.o: ../../Source/Pd/x_libpd_multi.c
$(JUCE_OBJDIR)/PluginLookAndFeel_c7d4572c.o: ../../Source/PluginLookAndFeel.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling x_libpd_multi.c"
$(V_AT)$(CC) $(JUCE_CFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"
@echo "Compiling PluginLookAndFeel.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/Gui_edc4c728.o: ../../Source/Gui/Gui.cpp
$(JUCE_OBJDIR)/PdInstance_ddabcf25.o: ../../Source/Pd/PdInstance.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling Gui.cpp"
@echo "Compiling PdInstance.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/GuiConsole_79dfc099.o: ../../Source/Gui/GuiConsole.cpp
$(JUCE_OBJDIR)/PdPatch_69639a82.o: ../../Source/Pd/PdPatch.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling GuiConsole.cpp"
@echo "Compiling PdPatch.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/GuiObject_aa3d2cc7.o: ../../Source/Gui/GuiObject.cpp
$(JUCE_OBJDIR)/PdObject_b945538f.o: ../../Source/Pd/PdObject.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling GuiObject.cpp"
@echo "Compiling PdObject.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/LookAndFeel_7fdda4eb.o: ../../Source/Gui/LookAndFeel.cpp
$(JUCE_OBJDIR)/x_libpd_multi_1036951a.o: ../../Source/Pd/x_libpd_multi.c
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling LookAndFeel.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"
@echo "Compiling x_libpd_multi.c"
$(V_AT)$(CC) $(JUCE_CFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"

$(JUCE_OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
Expand Down
Loading

0 comments on commit 1a70eb6

Please sign in to comment.