[SCM] juce/master: Refreshed patches.

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Sep 21 11:40:03 UTC 2016


The following commit has been merged in the master branch:
commit 704781d2e073c433aa2c8a5eece1b7dc124d0f29
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Sep 21 11:30:51 2016 +0200

    Refreshed patches.

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
index 5f3a5a5..67b671a 100644
--- a/debian/patches/debian_fixed-defines.patch
+++ b/debian/patches/debian_fixed-defines.patch
@@ -12,7 +12,7 @@ Last-Update: 2016-04-07
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/modules/juce_core/juce_core.h
 +++ juce/modules/juce_core/juce_core.h
-@@ -70,6 +70,28 @@
+@@ -71,6 +71,28 @@
  
  #include "system/juce_TargetPlatform.h"
  
diff --git a/debian/patches/debian_make-projucer.patch b/debian/patches/debian_make-projucer.patch
index a029d05..10fa440 100644
--- a/debian/patches/debian_make-projucer.patch
+++ b/debian/patches/debian_make-projucer.patch
@@ -6,82 +6,74 @@ Last-Update: 2015-01-29
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile
 +++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile
-@@ -8,6 +8,8 @@
+@@ -16,6 +16,8 @@
    CONFIG=Debug
  endif
  
 +LIBJUCE_PATH=../../../../debian/libbuilder/build/
 +
  ifeq ($(CONFIG),Debug)
-   BINDIR := build
-   LIBDIR := build
-@@ -15,16 +17,16 @@
-   OUTDIR := build
+   JUCE_BINDIR := build
+   JUCE_LIBDIR := build
+@@ -23,13 +25,13 @@
+   JUCE_OUTDIR := build
  
    ifeq ($(TARGET_ARCH),)
 -    TARGET_ARCH := -march=native
 +    TARGET_ARCH :=
    endif
  
--  CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.3 -DJUCE_APP_VERSION_HEX=0x40203 -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11
--  CXXFLAGS += $(CFLAGS) -std=c++11
--  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl 
-+  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.3 -DJUCE_APP_VERSION_HEX=0x40203 -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)
-+  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 $(CFLAGS)
-+  JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)
-+  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(LIBJUCE_PATH) -ljuce_d $(LDFLAGS)
+-  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules
++  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS)
+   JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11
+   JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11
+-  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt 
++  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(LIBJUCE_PATH) -ljuce_d $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt 
  
    TARGET := Projucer
--  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
-+  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
-   CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
- endif
- 
-@@ -35,16 +37,16 @@
-   OUTDIR := build
+   BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+@@ -43,13 +45,13 @@
+   JUCE_OUTDIR := build
  
    ifeq ($(TARGET_ARCH),)
 -    TARGET_ARCH := -march=native
 +    TARGET_ARCH :=
    endif
  
--  CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.3 -DJUCE_APP_VERSION_HEX=0x40203 -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11
--  CXXFLAGS += $(CFLAGS) -std=c++11
--  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl 
-+  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.3" -D "JUCE_APP_VERSION_HEX=0x40203" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)
-+  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 $(CFLAGS)
-+  JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)
-+  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L$(LIBJUCE_PATH) -ljuce $(LDFLAGS)
+-  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules
++  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS)
+   JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11
+   JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11
+-  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt 
++  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(LIBJUCE_PATH) -ljuce $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt 
  
    TARGET := Projucer
--  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
-+  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
-   CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
- endif
- 
-@@ -97,13 +99,6 @@
-   $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \
-   $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \
-   $(OBJDIR)/BinaryData_ce4232d4.o \
--  $(OBJDIR)/juce_core_75b14332.o \
--  $(OBJDIR)/juce_cryptography_6de2ebff.o \
--  $(OBJDIR)/juce_data_structures_72d3da2c.o \
--  $(OBJDIR)/juce_events_d2be882c.o \
--  $(OBJDIR)/juce_graphics_9c18891e.o \
--  $(OBJDIR)/juce_gui_basics_8a6da59c.o \
--  $(OBJDIR)/juce_gui_extra_4a026f23.o \
+   BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+@@ -105,13 +107,6 @@
+   $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o \
+   $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \
+   $(JUCE_OBJDIR)/BinaryData_ce4232d4.o \
+-  $(JUCE_OBJDIR)/juce_core_75b14332.o \
+-  $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o \
+-  $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o \
+-  $(JUCE_OBJDIR)/juce_events_d2be882c.o \
+-  $(JUCE_OBJDIR)/juce_graphics_9c18891e.o \
+-  $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o \
+-  $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o \
  
  .PHONY: clean
  
-@@ -112,11 +107,11 @@
- 	- at mkdir -p $(BINDIR)
- 	- at mkdir -p $(LIBDIR)
- 	- at mkdir -p $(OUTDIR)
+@@ -120,7 +115,7 @@
+ 	- at mkdir -p $(JUCE_BINDIR)
+ 	- at mkdir -p $(JUCE_LIBDIR)
+ 	- at mkdir -p $(JUCE_OUTDIR)
 -	@$(BLDCMD)
 +	$(BLDCMD)
  
+ check-pkg-config:
+ 	@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
+@@ -128,285 +123,285 @@
+ 
  clean:
  	@echo Cleaning Projucer
 -	@$(CLEANCMD)
@@ -89,335 +81,337 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  strip:
  	@echo Stripping Projucer
-@@ -125,276 +120,276 @@
- $(OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp
- 	- at mkdir -p $(OBJDIR)
+-	-@$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET)
++	-$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET)
+ 
+ $(JUCE_OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_AppearanceSettings.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_AutoUpdater.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_CommandLine.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_DocumentEditorComponent.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_GlobalPreferences.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_Main.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainWindow.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainWindow.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_MainWindow.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_OpenDocumentManager.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling projucer_CompileEngineClient.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling projucer_CompileEngineServer.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_SourceCodeEditor.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ComponentTypeHandler.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ButtonDocument.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ComponentDocument.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ColouredElement.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_PaintElement.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_PaintElementPath.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ComponentLayoutEditor.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ComponentOverlayComponent.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_EditingPanelBase.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_JucerDocumentEditor.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_PaintRoutineEditor.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_PaintRoutinePanel.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ResourceEditorPanel.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_TestComponent.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_BinaryResources.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ComponentLayout.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_GeneratedCode.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_JucerDocument.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ObjectTypes.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_PaintRoutine.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_DependencyPathPropertyComponent.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_Module.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_Project.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ProjectExporter.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ProjectSaver.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ResourceFile.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_CodeHelpers.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_FileHelpers.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_Icons.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_JucerTreeViewBase.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_MiscUtilities.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_ProjucerLookAndFeel.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_SlidingPanelComponent.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_StoredSettings.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_NewFileWizard.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling jucer_NewProjectWizardClasses.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling BinaryData.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling juce_core.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling juce_cryptography.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling juce_data_structures.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling juce_events.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling juce_graphics.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling juce_gui_basics.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
- $(OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp
- 	- at mkdir -p $(OBJDIR)
+ $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp
+ 	- at mkdir -p $(JUCE_OBJDIR)
  	@echo "Compiling juce_gui_extra.cpp"
--	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+-	@$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
  -include $(OBJECTS:%.o=%.d)
diff --git a/debian/patches/debian_projucer-modulepath.patch b/debian/patches/debian_projucer-modulepath.patch
index fc5779c..6d8a870 100644
--- a/debian/patches/debian_projucer-modulepath.patch
+++ b/debian/patches/debian_projucer-modulepath.patch
@@ -6,7 +6,7 @@ Last-Update: 2015-01-28
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/extras/Projucer/Source/Application/jucer_MainWindow.cpp
 +++ juce/extras/Projucer/Source/Application/jucer_MainWindow.cpp
-@@ -605,5 +605,9 @@
+@@ -628,5 +628,9 @@
          f = parent;
      }
  

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list