From 2ff6de2a94523ae07b2186c2f5e047da73c109fa Mon Sep 17 00:00:00 2001 From: hogliux Date: Tue, 9 May 2017 13:00:00 +0100 Subject: [PATCH] Linux: re-saved all projects to update broken linux Makefiles (see previous commit) --- examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile | 2 +- examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile | 2 +- examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile | 2 +- examples/BouncingBallWavetableDemo/Builds/Linux/Makefile | 2 +- examples/Demo/Builds/Linux/Makefile | 2 +- examples/HelloWorld/Builds/Linux/Makefile | 2 +- examples/MPETest/Builds/LinuxMakefile/Makefile | 2 +- examples/MidiTest/Builds/LinuxMakefile/Makefile | 2 +- examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile | 2 +- examples/OSCMonitor/Builds/LinuxMakefile/Makefile | 2 +- examples/OSCReceiver/Builds/LinuxMakefile/Makefile | 2 +- examples/OSCSender/Builds/LinuxMakefile/Makefile | 2 +- .../PlugInSamples/Surround/Builds/LinuxMakefile/Makefile | 3 ++- examples/audio plugin demo/Builds/Linux/Makefile | 4 +++- examples/audio plugin host/Builds/Linux/Makefile | 6 +++--- extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile | 2 +- extras/Projucer/Builds/LinuxMakefile/Makefile | 2 +- extras/UnitTestRunner/Builds/LinuxMakefile/Makefile | 2 +- extras/binarybuilder/Builds/Linux/Makefile | 2 +- 19 files changed, 24 insertions(+), 21 deletions(-) diff --git a/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile index 56d800ed53..ce226d29cc 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile @@ -172,4 +172,4 @@ strip: @echo Stripping BlocksDrawing -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile index c593df6dbe..267a4bc0db 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile @@ -172,4 +172,4 @@ strip: @echo Stripping BlocksMonitor -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile index 36526bd815..295440393c 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile @@ -172,4 +172,4 @@ strip: @echo Stripping BlocksSynth -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/BouncingBallWavetableDemo/Builds/Linux/Makefile b/examples/BouncingBallWavetableDemo/Builds/Linux/Makefile index c124a0dde4..87def6a389 100644 --- a/examples/BouncingBallWavetableDemo/Builds/Linux/Makefile +++ b/examples/BouncingBallWavetableDemo/Builds/Linux/Makefile @@ -178,4 +178,4 @@ strip: @echo Stripping BouncingBallWavetableDemo -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/Demo/Builds/Linux/Makefile b/examples/Demo/Builds/Linux/Makefile index f24aa18d6f..1f4969c444 100644 --- a/examples/Demo/Builds/Linux/Makefile +++ b/examples/Demo/Builds/Linux/Makefile @@ -430,4 +430,4 @@ strip: @echo Stripping JuceDemo -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/HelloWorld/Builds/Linux/Makefile b/examples/HelloWorld/Builds/Linux/Makefile index 23f7c7aace..c93a255761 100644 --- a/examples/HelloWorld/Builds/Linux/Makefile +++ b/examples/HelloWorld/Builds/Linux/Makefile @@ -136,4 +136,4 @@ strip: @echo Stripping HelloWorld -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/MPETest/Builds/LinuxMakefile/Makefile b/examples/MPETest/Builds/LinuxMakefile/Makefile index 5aabcbfd78..3d9feda38f 100644 --- a/examples/MPETest/Builds/LinuxMakefile/Makefile +++ b/examples/MPETest/Builds/LinuxMakefile/Makefile @@ -178,4 +178,4 @@ strip: @echo Stripping MPETest -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/MidiTest/Builds/LinuxMakefile/Makefile b/examples/MidiTest/Builds/LinuxMakefile/Makefile index 6e40f82851..8cf72f34be 100644 --- a/examples/MidiTest/Builds/LinuxMakefile/Makefile +++ b/examples/MidiTest/Builds/LinuxMakefile/Makefile @@ -166,4 +166,4 @@ strip: @echo Stripping MidiTest -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile b/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile index 8e57475ed1..fa0b092a46 100644 --- a/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile +++ b/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile @@ -184,4 +184,4 @@ strip: @echo Stripping JUCE Network Graphics Demo -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/OSCMonitor/Builds/LinuxMakefile/Makefile b/examples/OSCMonitor/Builds/LinuxMakefile/Makefile index cafdb1e4fa..5963e5178d 100644 --- a/examples/OSCMonitor/Builds/LinuxMakefile/Makefile +++ b/examples/OSCMonitor/Builds/LinuxMakefile/Makefile @@ -178,4 +178,4 @@ strip: @echo Stripping OSCMonitor -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/OSCReceiver/Builds/LinuxMakefile/Makefile b/examples/OSCReceiver/Builds/LinuxMakefile/Makefile index 65cb6e05df..0d145a8ffa 100644 --- a/examples/OSCReceiver/Builds/LinuxMakefile/Makefile +++ b/examples/OSCReceiver/Builds/LinuxMakefile/Makefile @@ -142,4 +142,4 @@ strip: @echo Stripping OSCReceiver -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/OSCSender/Builds/LinuxMakefile/Makefile b/examples/OSCSender/Builds/LinuxMakefile/Makefile index c33956ef80..7d31dbbd10 100644 --- a/examples/OSCSender/Builds/LinuxMakefile/Makefile +++ b/examples/OSCSender/Builds/LinuxMakefile/Makefile @@ -130,4 +130,4 @@ strip: @echo Stripping OSCSender -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile b/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile index 9307878032..1c9d03e7ed 100644 --- a/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile +++ b/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile @@ -209,4 +209,5 @@ strip: @echo Stripping Surround -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_VST:%.o=%.d) +-include $(OBJECTS_SHARED_CODE:%.o=%.d) diff --git a/examples/audio plugin demo/Builds/Linux/Makefile b/examples/audio plugin demo/Builds/Linux/Makefile index 3c3d86baaf..8259858ff6 100644 --- a/examples/audio plugin demo/Builds/Linux/Makefile +++ b/examples/audio plugin demo/Builds/Linux/Makefile @@ -224,4 +224,6 @@ strip: @echo Stripping JuceDemoPlugin -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_VST:%.o=%.d) +-include $(OBJECTS_STANDALONE_PLUGIN:%.o=%.d) +-include $(OBJECTS_SHARED_CODE:%.o=%.d) diff --git a/examples/audio plugin host/Builds/Linux/Makefile b/examples/audio plugin host/Builds/Linux/Makefile index 816183bfb3..8b2e23d219 100644 --- a/examples/audio plugin host/Builds/Linux/Makefile +++ b/examples/audio plugin host/Builds/Linux/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I$(HOME)/SDKs/VST_SDK/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I$(HOME)/SDKs/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -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 JUCE_TARGET_APP := Plugin\ Host @@ -54,7 +54,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I$(HOME)/SDKs/VST_SDK/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I$(HOME)/SDKs/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -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 JUCE_TARGET_APP := Plugin\ Host @@ -208,4 +208,4 @@ strip: @echo Stripping Plugin Host -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile index 9f38015bac..59f44d0a8e 100644 --- a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile +++ b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile @@ -160,4 +160,4 @@ strip: @echo Stripping AudioPerformanceTest -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile index 4a12c59b81..7f10d3d2d0 100644 --- a/extras/Projucer/Builds/LinuxMakefile/Makefile +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -430,4 +430,4 @@ strip: @echo Stripping Projucer -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_APP:%.o=%.d) diff --git a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile index d43272f0dc..bc20bac32f 100644 --- a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile +++ b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile @@ -178,4 +178,4 @@ strip: @echo Stripping UnitTestRunner -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_CONSOLEAPP:%.o=%.d) diff --git a/extras/binarybuilder/Builds/Linux/Makefile b/extras/binarybuilder/Builds/Linux/Makefile index 047917fe25..7442b0ed86 100644 --- a/extras/binarybuilder/Builds/Linux/Makefile +++ b/extras/binarybuilder/Builds/Linux/Makefile @@ -100,4 +100,4 @@ strip: @echo Stripping BinaryBuilder -$(V_AT)$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET) --include $(OBJECTS:%.o=%.d) +-include $(OBJECTS_CONSOLEAPP:%.o=%.d)