Refreshed patches.

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
index 5f3a5a53ffb8b242c99dcf46d2787d9dcae124a4..67b671ab571d8bc0f0f47093e911c008a1806896 100644 (file)
--- 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 @@
  \r
  #include "system/juce_TargetPlatform.h"\r
  \r

diff --git a/debian/patches/debian_make-projucer.patch b/debian/patches/debian_make-projucer.patch
index a029d05fac19e36435125ffab479feea32a839c2..10fa44069d9bd718f30b4e029dca0e4615fb24c3 100644 (file)
--- 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\r
  endif\r
  \r
 +LIBJUCE_PATH=../../../../debian/libbuilder/build/\r
 +\r
  ifeq ($(CONFIG),Debug)\r
-   BINDIR := build\r
-   LIBDIR := build\r
-@@ -15,16 +17,16 @@
-   OUTDIR := build\r
+   JUCE_BINDIR := build\r
+   JUCE_LIBDIR := build\r
+@@ -23,13 +25,13 @@
+   JUCE_OUTDIR := build\r
  \r
    ifeq ($(TARGET_ARCH),)\r
 -    TARGET_ARCH := -march=native\r
 +    TARGET_ARCH :=\r
    endif\r
  \r
--  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\r
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11\r
--  CXXFLAGS += $(CFLAGS) -std=c++11\r
--  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl \r
-+  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)\r
-+  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 $(CFLAGS)\r
-+  JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)\r
-+  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(LIBJUCE_PATH) -ljuce_d $(LDFLAGS)\r
+-  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\r
++  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)\r
+   JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11\r
+   JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11\r
+-  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt \r
++  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 \r
  \r
    TARGET := Projucer\r
--  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
-+  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
-   CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)\r
- endif\r
- \r
-@@ -35,16 +37,16 @@
-   OUTDIR := build\r
+   BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
+@@ -43,13 +45,13 @@
+   JUCE_OUTDIR := build\r
  \r
    ifeq ($(TARGET_ARCH),)\r
 -    TARGET_ARCH := -march=native\r
 +    TARGET_ARCH :=\r
    endif\r
  \r
--  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\r
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11\r
--  CXXFLAGS += $(CFLAGS) -std=c++11\r
--  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl \r
-+  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)\r
-+  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 $(CFLAGS)\r
-+  JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)\r
-+  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L$(LIBJUCE_PATH) -ljuce $(LDFLAGS)\r
+-  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\r
++  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)\r
+   JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11\r
+   JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11\r
+-  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 \r
++  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 \r
  \r
    TARGET := Projucer\r
--  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
-+  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
-   CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)\r
- endif\r
- \r
-@@ -97,13 +99,6 @@
-   $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \\r
-   $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \\r
-   $(OBJDIR)/BinaryData_ce4232d4.o \\r
--  $(OBJDIR)/juce_core_75b14332.o \\r
--  $(OBJDIR)/juce_cryptography_6de2ebff.o \\r
--  $(OBJDIR)/juce_data_structures_72d3da2c.o \\r
--  $(OBJDIR)/juce_events_d2be882c.o \\r
--  $(OBJDIR)/juce_graphics_9c18891e.o \\r
--  $(OBJDIR)/juce_gui_basics_8a6da59c.o \\r
--  $(OBJDIR)/juce_gui_extra_4a026f23.o \\r
+   BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
+@@ -105,13 +107,6 @@
+   $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o \\r
+   $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \\r
+   $(JUCE_OBJDIR)/BinaryData_ce4232d4.o \\r
+-  $(JUCE_OBJDIR)/juce_core_75b14332.o \\r
+-  $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o \\r
+-  $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o \\r
+-  $(JUCE_OBJDIR)/juce_events_d2be882c.o \\r
+-  $(JUCE_OBJDIR)/juce_graphics_9c18891e.o \\r
+-  $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o \\r
+-  $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o \\r
  \r
  .PHONY: clean\r
  \r
-@@ -112,11 +107,11 @@
-       -@mkdir -p $(BINDIR)\r
-       -@mkdir -p $(LIBDIR)\r
-       -@mkdir -p $(OUTDIR)\r
+@@ -120,7 +115,7 @@
+       -@mkdir -p $(JUCE_BINDIR)\r
+       -@mkdir -p $(JUCE_LIBDIR)\r
+       -@mkdir -p $(JUCE_OUTDIR)\r
 -      @$(BLDCMD)\r
 +      $(BLDCMD)\r
  \r
+ check-pkg-config:\r
+       @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }\r
+@@ -128,285 +123,285 @@
+ \r
  clean:\r
        @echo Cleaning Projucer\r
 -      @$(CLEANCMD)\r
@@ -89,335 +81,337 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
  strip:\r
        @echo Stripping Projucer\r
-@@ -125,276 +120,276 @@
- $(OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+-      -@$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET)\r
++      -$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET)\r
+ \r
+ $(JUCE_OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_AppearanceSettings.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_AutoUpdater.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_CommandLine.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_DocumentEditorComponent.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_GlobalPreferences.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_Main.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainWindow.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainWindow.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_MainWindow.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_OpenDocumentManager.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling projucer_CompileEngineClient.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling projucer_CompileEngineServer.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_SourceCodeEditor.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ComponentTypeHandler.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ButtonDocument.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ComponentDocument.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ColouredElement.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_PaintElement.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_PaintElementPath.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ComponentLayoutEditor.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ComponentOverlayComponent.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_EditingPanelBase.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_JucerDocumentEditor.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_PaintRoutineEditor.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_PaintRoutinePanel.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ResourceEditorPanel.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_TestComponent.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_BinaryResources.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ComponentLayout.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_GeneratedCode.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_JucerDocument.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ObjectTypes.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_PaintRoutine.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_DependencyPathPropertyComponent.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_Module.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_Project.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ProjectExporter.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ProjectSaver.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ResourceFile.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_CodeHelpers.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_FileHelpers.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_Icons.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_JucerTreeViewBase.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_MiscUtilities.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_ProjucerLookAndFeel.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_SlidingPanelComponent.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_StoredSettings.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_NewFileWizard.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling jucer_NewProjectWizardClasses.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling BinaryData.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling juce_core.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling juce_cryptography.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling juce_data_structures.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling juce_events.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling juce_graphics.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling juce_gui_basics.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp\r
-       -@mkdir -p $(OBJDIR)\r
+ $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp\r
+       -@mkdir -p $(JUCE_OBJDIR)\r
        @echo "Compiling juce_gui_extra.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
+-      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
  -include $(OBJECTS:%.o=%.d)\r

diff --git a/debian/patches/debian_projucer-modulepath.patch b/debian/patches/debian_projucer-modulepath.patch
index fc5779c7f0052f7bb9b0ef504179906bcf76f6b2..6d8a870b3f6d11c5aabac652029b273a880560c3 100644 (file)
--- 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;\r
      }\r
  \r