+++ /dev/null
-Description: Debian specific search-path for modules
-Author: Debian
-Forwarded: not-needed
-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 @@
- f = parent;\r
- }\r
- \r
-+ File debian ("/usr/share/juce");\r
-+ if (isJuceFolder(debian))\r
-+ return debian.getChildFile ("modules");\r
-+\r
- return File();\r
- }\r
+++ /dev/null
-Description: fix make-file to allow additional FLAGS
- also print the compiler/linker command before executing it
-Author: IOhannes m zmölnig
-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 @@
- CONFIG=Debug\r
- endif\r
- \r
-+LIBJUCE_PATH=../../../../debian/libbuilder/build/\r
-+\r
- ifeq ($(CONFIG),Debug)\r
- BINDIR := build\r
- LIBDIR := build\r
-@@ -18,13 +20,13 @@
- TARGET_ARCH := -march=native\r
- endif\r
- \r
-- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -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) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -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/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS)\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
-@@ -38,13 +40,13 @@
- TARGET_ARCH := -march=native\r
- endif\r
- \r
-- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -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.1" -D "JUCE_APP_VERSION_HEX=0x40201" -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/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS)\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
- \r
- .PHONY: clean\r
- \r
-@@ -112,11 +107,11 @@
- -@mkdir -p $(BINDIR)\r
- -@mkdir -p $(LIBDIR)\r
- -@mkdir -p $(OUTDIR)\r
-- @$(BLDCMD)\r
-+ $(BLDCMD)\r
- \r
- clean:\r
- @echo Cleaning Projucer\r
-- @$(CLEANCMD)\r
-+ $(CLEANCMD)\r
- \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
- @echo "Compiling jucer_AppearanceSettings.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_AutoUpdater.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_CommandLine.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_DocumentEditorComponent.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_GlobalPreferences.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_Main.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_MainWindow.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_OpenDocumentManager.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling projucer_CompileEngineClient.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling projucer_CompileEngineServer.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_SourceCodeEditor.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ComponentTypeHandler.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ButtonDocument.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ComponentDocument.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ColouredElement.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_PaintElement.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_PaintElementPath.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ComponentLayoutEditor.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ComponentOverlayComponent.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_EditingPanelBase.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_JucerDocumentEditor.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_PaintRoutineEditor.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_PaintRoutinePanel.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ResourceEditorPanel.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_TestComponent.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_BinaryResources.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ComponentLayout.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_GeneratedCode.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_JucerDocument.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ObjectTypes.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_PaintRoutine.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_DependencyPathPropertyComponent.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_Module.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_Project.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ProjectExporter.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ProjectSaver.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ResourceFile.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_CodeHelpers.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_FileHelpers.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_Icons.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_JucerTreeViewBase.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_MiscUtilities.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_ProjucerLookAndFeel.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_SlidingPanelComponent.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_StoredSettings.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_NewFileWizard.cpp"\r
-- @$(CXX) $(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
- @echo "Compiling jucer_NewProjectWizardClasses.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_core_75b14332.o: ../../JuceLibraryCode/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_6de2ebff.o: ../../JuceLibraryCode/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_72d3da2c.o: ../../JuceLibraryCode/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_d2be882c.o: ../../JuceLibraryCode/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_9c18891e.o: ../../JuceLibraryCode/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_8a6da59c.o: ../../JuceLibraryCode/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_4a026f23.o: ../../JuceLibraryCode/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
- -include $(OBJECTS:%.o=%.d)\r
---- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h
-+++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h
-@@ -50,7 +50,7 @@
- #endif\r
- \r
- #ifndef JUCE_LOG_ASSERTIONS\r
-- #define JUCE_LOG_ASSERTIONS 1\r
-+// #define JUCE_LOG_ASSERTIONS 1\r
- #endif\r
- \r
- #ifndef JUCE_CHECK_MEMORY_LEAKS\r
--- /dev/null
+Description: fix make-file to allow additional FLAGS
+ also print the compiler/linker command before executing it
+Author: IOhannes m zmölnig
+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 @@
+ CONFIG=Debug\r
+ endif\r
+ \r
++LIBJUCE_PATH=../../../../debian/libbuilder/build/\r
++\r
+ ifeq ($(CONFIG),Debug)\r
+ BINDIR := build\r
+ LIBDIR := build\r
+@@ -18,13 +20,13 @@
+ TARGET_ARCH := -march=native\r
+ endif\r
+ \r
+- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -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) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -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/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS)\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
+@@ -38,13 +40,13 @@
+ TARGET_ARCH := -march=native\r
+ endif\r
+ \r
+- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -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.1" -D "JUCE_APP_VERSION_HEX=0x40201" -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/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS)\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
+ \r
+ .PHONY: clean\r
+ \r
+@@ -112,11 +107,11 @@
+ -@mkdir -p $(BINDIR)\r
+ -@mkdir -p $(LIBDIR)\r
+ -@mkdir -p $(OUTDIR)\r
+- @$(BLDCMD)\r
++ $(BLDCMD)\r
+ \r
+ clean:\r
+ @echo Cleaning Projucer\r
+- @$(CLEANCMD)\r
++ $(CLEANCMD)\r
+ \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
+ @echo "Compiling jucer_AppearanceSettings.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_AutoUpdater.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_CommandLine.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_DocumentEditorComponent.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_GlobalPreferences.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_Main.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_MainWindow.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_OpenDocumentManager.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling projucer_CompileEngineClient.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling projucer_CompileEngineServer.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_SourceCodeEditor.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ComponentTypeHandler.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ButtonDocument.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ComponentDocument.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ColouredElement.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_PaintElement.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_PaintElementPath.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ComponentLayoutEditor.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ComponentOverlayComponent.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_EditingPanelBase.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_JucerDocumentEditor.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_PaintRoutineEditor.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_PaintRoutinePanel.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ResourceEditorPanel.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_TestComponent.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_BinaryResources.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ComponentLayout.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_GeneratedCode.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_JucerDocument.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ObjectTypes.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_PaintRoutine.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_DependencyPathPropertyComponent.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_Module.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_Project.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ProjectExporter.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ProjectSaver.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ResourceFile.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_CodeHelpers.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_FileHelpers.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_Icons.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_JucerTreeViewBase.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_MiscUtilities.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_ProjucerLookAndFeel.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_SlidingPanelComponent.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_StoredSettings.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_NewFileWizard.cpp"\r
+- @$(CXX) $(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
+ @echo "Compiling jucer_NewProjectWizardClasses.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_core_75b14332.o: ../../JuceLibraryCode/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_6de2ebff.o: ../../JuceLibraryCode/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_72d3da2c.o: ../../JuceLibraryCode/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_d2be882c.o: ../../JuceLibraryCode/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_9c18891e.o: ../../JuceLibraryCode/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_8a6da59c.o: ../../JuceLibraryCode/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_4a026f23.o: ../../JuceLibraryCode/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
+ -include $(OBJECTS:%.o=%.d)\r
+--- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h
++++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h
+@@ -50,7 +50,7 @@
+ #endif\r
+ \r
+ #ifndef JUCE_LOG_ASSERTIONS\r
+- #define JUCE_LOG_ASSERTIONS 1\r
++// #define JUCE_LOG_ASSERTIONS 1\r
+ #endif\r
+ \r
+ #ifndef JUCE_CHECK_MEMORY_LEAKS\r
--- /dev/null
+Description: Debian specific search-path for modules
+Author: Debian
+Forwarded: not-needed
+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 @@
+ f = parent;\r
+ }\r
+ \r
++ File debian ("/usr/share/juce");\r
++ if (isJuceFolder(debian))\r
++ return debian.getChildFile ("modules");\r
++\r
+ return File();\r
+ }\r
+++ /dev/null
-Description: introjucer fixes
- introjucer creates Linux Makefiles, but they do silent builds and do not allow
- to override CPP/C/CXXFLAGS.
- this patch changes introjucer to honor the "V" build variable, so "V=1" will
- build verbosely.
- it also renames *FLAGS to JUCE_*FLAGS and appends the ordinary *FLAGS to them.
-Author: IOhannes m zmölnig
-Origin: Debian
-Last-Update: 2015-02-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- "juce.orig/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h"
-+++ "juce/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h"
-@@ -169,15 +169,16 @@
- \r
- void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const\r
- {\r
-- out << " CPPFLAGS := $(DEPFLAGS)";\r
-+ out << " JUCE_CPPFLAGS := $(DEPFLAGS)";\r
- writeDefineFlags (out, config);\r
- writeHeaderPathFlags (out, config);\r
-- out << newLine;\r
-+ out << " $(CPPFLAGS)"\r
-+ << newLine;\r
- }\r
- \r
- void writeLinkerFlags (OutputStream& out, const BuildConfiguration& config) const\r
- {\r
-- out << " LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)";\r
-+ out << " JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)";\r
- \r
- {\r
- StringArray flags (makefileExtraLinkerFlags);\r
-@@ -207,7 +208,8 @@
- if (libraries.size() != 0)\r
- out << " -l" << replacePreprocessorTokens (config, libraries.joinIntoString (" -l")).trim();\r
- \r
-- out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim()\r
-+ out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim();\r
-+ out << " $(LDFLAGS)"\r
- << newLine;\r
- }\r
- \r
-@@ -236,7 +238,7 @@
- \r
- writeCppFlags (out, config);\r
- \r
-- out << " CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)";\r
-+ out << " JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH)";\r
- \r
- if (config.isDebug())\r
- out << " -g -ggdb";\r
-@@ -246,6 +248,7 @@
- \r
- out << " -O" << config.getGCCOptimisationFlag()\r
- << (" " + replacePreprocessorTokens (config, getExtraCompilerFlagsString())).trimEnd()\r
-+ << " $(CFLAGS)"\r
- << newLine;\r
- \r
- String cppStandardToUse (getCppStandardString());\r
-@@ -253,8 +256,9 @@
- if (cppStandardToUse.isEmpty())\r
- cppStandardToUse = "-std=c++11";\r
- \r
-- out << " CXXFLAGS += $(CFLAGS) "\r
-+ out << " JUCE_CXXFLAGS += $(JUCE_CFLAGS) "\r
- << cppStandardToUse\r
-+ << " $(CXXFLAGS)"\r
- << newLine;\r
- \r
- writeLinkerFlags (out, config);\r
-@@ -273,7 +277,7 @@
- if (projectType.isStaticLibrary())\r
- out << " BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS)" << newLine;\r
- else\r
-- out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine;\r
-+ out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine;\r
- \r
- out << " CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)" << newLine\r
- << "endif" << newLine\r
-@@ -297,6 +301,14 @@
- << "# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!" << newLine\r
- << newLine;\r
- \r
-+ out << "# build with \"V=1\" for verbose builds" << newLine\r
-+ << "ifeq ($(V), 1)" << newLine\r
-+ << "V_AT =" << newLine\r
-+ << "else" << newLine\r
-+ << "V_AT = @" << newLine\r
-+ << "endif" << newLine\r
-+ << newLine;\r
-+\r
- out << "# (this disables dependency generation if multiple architectures are set)" << newLine\r
- << "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine\r
- << newLine;\r
-@@ -319,12 +331,12 @@
- << "\t-@mkdir -p $(BINDIR)" << newLine\r
- << "\t-@mkdir -p $(LIBDIR)" << newLine\r
- << "\t-@mkdir -p $(OUTDIR)" << newLine\r
-- << "\t@$(BLDCMD)" << newLine\r
-+ << "\t$(V_AT)$(BLDCMD)" << newLine\r
- << newLine;\r
- \r
- out << "clean:" << newLine\r
- << "\t@echo Cleaning " << projectName << newLine\r
-- << "\t@$(CLEANCMD)" << newLine\r
-+ << "\t$(V_AT)$(CLEANCMD)" << newLine\r
- << newLine;\r
- \r
- out << "strip:" << newLine\r
-@@ -342,8 +354,8 @@
- << ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine\r
- << "\t-@mkdir -p $(OBJDIR)" << newLine\r
- << "\t@echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine\r
-- << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t@$(CC) $(CFLAGS) -o \"$@\" -c \"$<\""\r
-- : "\t@$(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"")\r
-+ << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t$(V_AT)$(CC) $(JUCE_CFLAGS) -o \"$@\" -c \"$<\""\r
-+ : "\t$(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o \"$@\" -c \"$<\"")\r
- << newLine << newLine;\r
- }\r
- }\r
--- /dev/null
+Description: introjucer fixes
+ introjucer creates Linux Makefiles, but they do silent builds and do not allow
+ to override CPP/C/CXXFLAGS.
+ this patch changes introjucer to honor the "V" build variable, so "V=1" will
+ build verbosely.
+ it also renames *FLAGS to JUCE_*FLAGS and appends the ordinary *FLAGS to them.
+Author: IOhannes m zmölnig
+Origin: Debian
+Last-Update: 2015-02-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- "juce.orig/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h"
++++ "juce/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h"
+@@ -169,15 +169,16 @@
+ \r
+ void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const\r
+ {\r
+- out << " CPPFLAGS := $(DEPFLAGS)";\r
++ out << " JUCE_CPPFLAGS := $(DEPFLAGS)";\r
+ writeDefineFlags (out, config);\r
+ writeHeaderPathFlags (out, config);\r
+- out << newLine;\r
++ out << " $(CPPFLAGS)"\r
++ << newLine;\r
+ }\r
+ \r
+ void writeLinkerFlags (OutputStream& out, const BuildConfiguration& config) const\r
+ {\r
+- out << " LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)";\r
++ out << " JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)";\r
+ \r
+ {\r
+ StringArray flags (makefileExtraLinkerFlags);\r
+@@ -207,7 +208,8 @@
+ if (libraries.size() != 0)\r
+ out << " -l" << replacePreprocessorTokens (config, libraries.joinIntoString (" -l")).trim();\r
+ \r
+- out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim()\r
++ out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim();\r
++ out << " $(LDFLAGS)"\r
+ << newLine;\r
+ }\r
+ \r
+@@ -236,7 +238,7 @@
+ \r
+ writeCppFlags (out, config);\r
+ \r
+- out << " CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)";\r
++ out << " JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH)";\r
+ \r
+ if (config.isDebug())\r
+ out << " -g -ggdb";\r
+@@ -246,6 +248,7 @@
+ \r
+ out << " -O" << config.getGCCOptimisationFlag()\r
+ << (" " + replacePreprocessorTokens (config, getExtraCompilerFlagsString())).trimEnd()\r
++ << " $(CFLAGS)"\r
+ << newLine;\r
+ \r
+ String cppStandardToUse (getCppStandardString());\r
+@@ -253,8 +256,9 @@
+ if (cppStandardToUse.isEmpty())\r
+ cppStandardToUse = "-std=c++11";\r
+ \r
+- out << " CXXFLAGS += $(CFLAGS) "\r
++ out << " JUCE_CXXFLAGS += $(JUCE_CFLAGS) "\r
+ << cppStandardToUse\r
++ << " $(CXXFLAGS)"\r
+ << newLine;\r
+ \r
+ writeLinkerFlags (out, config);\r
+@@ -273,7 +277,7 @@
+ if (projectType.isStaticLibrary())\r
+ out << " BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS)" << newLine;\r
+ else\r
+- out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine;\r
++ out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine;\r
+ \r
+ out << " CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)" << newLine\r
+ << "endif" << newLine\r
+@@ -297,6 +301,14 @@
+ << "# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!" << newLine\r
+ << newLine;\r
+ \r
++ out << "# build with \"V=1\" for verbose builds" << newLine\r
++ << "ifeq ($(V), 1)" << newLine\r
++ << "V_AT =" << newLine\r
++ << "else" << newLine\r
++ << "V_AT = @" << newLine\r
++ << "endif" << newLine\r
++ << newLine;\r
++\r
+ out << "# (this disables dependency generation if multiple architectures are set)" << newLine\r
+ << "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine\r
+ << newLine;\r
+@@ -319,12 +331,12 @@
+ << "\t-@mkdir -p $(BINDIR)" << newLine\r
+ << "\t-@mkdir -p $(LIBDIR)" << newLine\r
+ << "\t-@mkdir -p $(OUTDIR)" << newLine\r
+- << "\t@$(BLDCMD)" << newLine\r
++ << "\t$(V_AT)$(BLDCMD)" << newLine\r
+ << newLine;\r
+ \r
+ out << "clean:" << newLine\r
+ << "\t@echo Cleaning " << projectName << newLine\r
+- << "\t@$(CLEANCMD)" << newLine\r
++ << "\t$(V_AT)$(CLEANCMD)" << newLine\r
+ << newLine;\r
+ \r
+ out << "strip:" << newLine\r
+@@ -342,8 +354,8 @@
+ << ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine\r
+ << "\t-@mkdir -p $(OBJDIR)" << newLine\r
+ << "\t@echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine\r
+- << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t@$(CC) $(CFLAGS) -o \"$@\" -c \"$<\""\r
+- : "\t@$(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"")\r
++ << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t$(V_AT)$(CC) $(JUCE_CFLAGS) -o \"$@\" -c \"$<\""\r
++ : "\t$(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o \"$@\" -c \"$<\"")\r
+ << newLine << newLine;\r
+ }\r
+ }\r
no-ztypes.patch
fix-build-libpng16.patch
-#MANUAL#introjucer-makegenerator.patch
+#MANUAL#projucer-makegenerator.patch
reproducible-date.patch
debian_apply-reproducible-date.patch
debian_fixed-defines.patch
-debian_introjucer-modulepath.patch
-debian_make-introjucer.patch
+debian_projucer-modulepath.patch
+debian_make-projucer.patch
debian_do-not-track.patch
projects / juce.git / commitdiff