patch test-build so it honors FLAGS and is verbose

diff --git a/debian/patches/test-build b/debian/patches/test-build
index 9ff08aae433e985bf886c4e743b884c02214c43a..797da39330b3dd273e1aeeaf1963a917cae13842 100644 (file)
--- a/debian/patches/test-build
+++ b/debian/patches/test-build
@@ -15,21 +15,44 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  endif\r
  \r
  ifeq ($(CONFIG),Debug)\r
-@@ -39,9 +39,23 @@
+@@ -18,13 +18,13 @@
+     TARGET_ARCH := -march=native\r
    endif\r
  \r
-   CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules\r
+-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules\r
+-  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0\r
+-  CXXFLAGS += $(CFLAGS) -std=c++11\r
+-  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt \r
++  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)\r
++  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS)\r
++  JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)\r
++  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt $(LDFLAGS)\r
+ \r
+   TARGET := JuceDemo\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
+@@ -38,13 +38,28 @@
+     TARGET_ARCH := -march=native\r
+   endif\r
+ \r
+-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules\r
 -  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3\r
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -fPIC\r
-   CXXFLAGS += $(CFLAGS) -std=c++11\r
+-  CXXFLAGS += $(CFLAGS) -std=c++11\r
 -  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt \r
-+  LDFLAGS += $(TARGET_ARCH) -fPIC \\r
++  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)\r
++  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -fPIC $(CFLAGS)\r
++  JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)\r
++  JUCE_LDFLAGS += $(TARGET_ARCH) -fPIC \\r
 +      -fvisibility=hidden \\r
++      $(LDFLAGS) \\r
 +      -L ../../../../debian/libbuilder/build -ljuce \\r
 +      -L$(BINDIR) \\r
 +      -L$(LIBDIR) \\r
 +      -lGL\r
-+#  LDFLAGS += \\r
++#  JUCE_LDFLAGS += \\r
 +#     -lX11 \\r
 +#     -lXext \\r
 +#     -lXinerama \\r
@@ -40,8 +63,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +#     -lrt \r
  \r
    TARGET := JuceDemo\r
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
-@@ -90,21 +104,6 @@
+-  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
+@@ -90,21 +105,6 @@
    $(OBJDIR)/WindowsDemo_e8cfa428.o \\r
    $(OBJDIR)/XMLandJSONDemo_5bc88df3.o \\r
    $(OBJDIR)/BinaryData_ce4232d4.o \\r
@@ -63,7 +90,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
  .PHONY: clean\r
  \r
-@@ -113,7 +112,7 @@
+@@ -113,11 +113,11 @@
        -@mkdir -p $(BINDIR)\r
        -@mkdir -p $(LIBDIR)\r
        -@mkdir -p $(OUTDIR)\r
@@ -72,12 +99,346 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
  clean:\r
        @echo Cleaning JuceDemo\r
-@@ -126,7 +125,7 @@
+-      @$(CLEANCMD)\r
++      $(CLEANCMD)\r
+ \r
+ strip:\r
+       @echo Stripping JuceDemo\r
+@@ -126,281 +126,281 @@
  $(OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling Main.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
  $(OBJDIR)/MainWindow_499ac812.o: ../../Source/MainWindow.cpp\r
        -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling MainWindow.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/IntroScreen_73347059.o: ../../Source/IntroScreen.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling IntroScreen.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/AnimationDemo_9fc7e4e9.o: ../../Source/Demos/AnimationDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling AnimationDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/AudioLatencyDemo_78d49233.o: ../../Source/Demos/AudioLatencyDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling AudioLatencyDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/AudioPlaybackDemo_ea12adf6.o: ../../Source/Demos/AudioPlaybackDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling AudioPlaybackDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/AudioRecordingDemo_435914e6.o: ../../Source/Demos/AudioRecordingDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling AudioRecordingDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/AudioSettingsDemo_6d710bfe.o: ../../Source/Demos/AudioSettingsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling AudioSettingsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/AudioSynthesiserDemo_1b3666f6.o: ../../Source/Demos/AudioSynthesiserDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling AudioSynthesiserDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/Box2DDemo_51053c42.o: ../../Source/Demos/Box2DDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling Box2DDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/CameraDemo_a10f7e50.o: ../../Source/Demos/CameraDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling CameraDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/ChildProcessDemo_2c2b949e.o: ../../Source/Demos/ChildProcessDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling ChildProcessDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/CodeEditorDemo_d5c17a65.o: ../../Source/Demos/CodeEditorDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling CodeEditorDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/ComponentTransformsDemo_377f7889.o: ../../Source/Demos/ComponentTransformsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling ComponentTransformsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/CryptographyDemo_232d46d7.o: ../../Source/Demos/CryptographyDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling CryptographyDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/DialogsDemo_19d585d0.o: ../../Source/Demos/DialogsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling DialogsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/FontsDemo_6da1e5e9.o: ../../Source/Demos/FontsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling FontsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/GraphicsDemo_85142ef6.o: ../../Source/Demos/GraphicsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling GraphicsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/ImagesDemo_ecf13aa3.o: ../../Source/Demos/ImagesDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling ImagesDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/JavaScript_d6e42eb5.o: ../../Source/Demos/JavaScript.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling JavaScript.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/KeyMappingsDemo_cf05c709.o: ../../Source/Demos/KeyMappingsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling KeyMappingsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/LiveConstantDemo_e3b18a9b.o: ../../Source/Demos/LiveConstantDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling LiveConstantDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/LookAndFeelDemo_25c558a3.o: ../../Source/Demos/LookAndFeelDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling LookAndFeelDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/MDIDemo_c476c2d7.o: ../../Source/Demos/MDIDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling MDIDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/MidiDemo_75ebc30c.o: ../../Source/Demos/MidiDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling MidiDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/MultithreadingDemo_ff566eaa.o: ../../Source/Demos/MultithreadingDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling MultithreadingDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/MultiTouch_595f3a2e.o: ../../Source/Demos/MultiTouch.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling MultiTouch.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/NetworkingDemo_fbd1b19f.o: ../../Source/Demos/NetworkingDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling NetworkingDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/OpenGLDemo_fdac55da.o: ../../Source/Demos/OpenGLDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling OpenGLDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/OpenGLDemo2D_48eeadec.o: ../../Source/Demos/OpenGLDemo2D.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling OpenGLDemo2D.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/PropertiesDemo_8ff1a8de.o: ../../Source/Demos/PropertiesDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling PropertiesDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/SystemInfoDemo_984acd28.o: ../../Source/Demos/SystemInfoDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling SystemInfoDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/TimersAndEventsDemo_f2656547.o: ../../Source/Demos/TimersAndEventsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling TimersAndEventsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/UnitTestsDemo_5c21762.o: ../../Source/Demos/UnitTestsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling UnitTestsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/ValueTreesDemo_9657d84f.o: ../../Source/Demos/ValueTreesDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling ValueTreesDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/VideoDemo_b55a1560.o: ../../Source/Demos/VideoDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling VideoDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/WebBrowserDemo_3df2dbdf.o: ../../Source/Demos/WebBrowserDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling WebBrowserDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/WidgetsDemo_fb0454.o: ../../Source/Demos/WidgetsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling WidgetsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/WindowsDemo_e8cfa428.o: ../../Source/Demos/WindowsDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling WindowsDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/XMLandJSONDemo_5bc88df3.o: ../../Source/Demos/XMLandJSONDemo.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling XMLandJSONDemo.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling BinaryData.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_audio_basics_399a455e.o: ../../../../modules/juce_audio_basics/juce_audio_basics.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_audio_basics.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_audio_devices_c1c9ba9c.o: ../../../../modules/juce_audio_devices/juce_audio_devices.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_audio_devices.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_audio_formats_f04b043c.o: ../../../../modules/juce_audio_formats/juce_audio_formats.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_audio_formats.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_audio_processors_eb9ae116.o: ../../../../modules/juce_audio_processors/juce_audio_processors.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_audio_processors.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_audio_utils_cf18005c.o: ../../../../modules/juce_audio_utils/juce_audio_utils.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_audio_utils.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_box2d_7c8de7fc.o: ../../../../modules/juce_box2d/juce_box2d.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_box2d.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_core_1ee54a40.o: ../../../../modules/juce_core/juce_core.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_core.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_cryptography_3b1f489a.o: ../../../../modules/juce_cryptography/juce_cryptography.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_cryptography.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_data_structures_84790dfc.o: ../../../../modules/juce_data_structures/juce_data_structures.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_data_structures.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_events_584896b4.o: ../../../../modules/juce_events/juce_events.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_events.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_graphics_f9afc18.o: ../../../../modules/juce_graphics/juce_graphics.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_graphics.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_gui_basics_90929794.o: ../../../../modules/juce_gui_basics/juce_gui_basics.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_gui_basics.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_gui_extra_b81d9e1c.o: ../../../../modules/juce_gui_extra/juce_gui_extra.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_gui_extra.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_opengl_1890bee0.o: ../../../../modules/juce_opengl/juce_opengl.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_opengl.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/juce_video_86a19d3c.o: ../../../../modules/juce_video/juce_video.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling juce_video.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ -include $(OBJECTS:%.o=%.d)\r