From: IOhannes m zmölnig Date: Thu, 28 Apr 2016 15:24:50 +0000 (+0200) Subject: Renamed 'introjucer' patches to 'projucer' X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1~1^2~229 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98e17a0738e5eae7cc3d96f3aa49e541900988f7;p=juce.git Renamed 'introjucer' patches to 'projucer' --- diff --git a/debian/patches/debian_introjucer-modulepath.patch b/debian/patches/debian_introjucer-modulepath.patch deleted file mode 100644 index fc5779c7..00000000 --- a/debian/patches/debian_introjucer-modulepath.patch +++ /dev/null @@ -1,18 +0,0 @@ -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; - } - -+ File debian ("/usr/share/juce"); -+ if (isJuceFolder(debian)) -+ return debian.getChildFile ("modules"); -+ - return File(); - } diff --git a/debian/patches/debian_make-introjucer.patch b/debian/patches/debian_make-introjucer.patch deleted file mode 100644 index 4db7764b..00000000 --- a/debian/patches/debian_make-introjucer.patch +++ /dev/null @@ -1,426 +0,0 @@ -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 - endif - -+LIBJUCE_PATH=../../../../debian/libbuilder/build/ -+ - ifeq ($(CONFIG),Debug) - BINDIR := build - LIBDIR := build -@@ -18,13 +20,13 @@ - TARGET_ARCH := -march=native - endif - -- 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 -- CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 -- CXXFLAGS += $(CFLAGS) -std=c++11 -- LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl -+ JUCE_CPPFLAGS := $(DEPFLAGS) -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) -+ JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 $(CFLAGS) -+ JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) -+ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS) - - TARGET := Projucer -- BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) -+ BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) - CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) - endif - -@@ -38,13 +40,13 @@ - TARGET_ARCH := -march=native - endif - -- 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 -- CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 -- CXXFLAGS += $(CFLAGS) -std=c++11 -- LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl -+ JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS) -+ JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 $(CFLAGS) -+ JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) -+ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS) - - TARGET := Projucer -- BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) -+ BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) - CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) - endif - -@@ -97,13 +99,6 @@ - $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \ - $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \ - $(OBJDIR)/BinaryData_ce4232d4.o \ -- $(OBJDIR)/juce_core_75b14332.o \ -- $(OBJDIR)/juce_cryptography_6de2ebff.o \ -- $(OBJDIR)/juce_data_structures_72d3da2c.o \ -- $(OBJDIR)/juce_events_d2be882c.o \ -- $(OBJDIR)/juce_graphics_9c18891e.o \ -- $(OBJDIR)/juce_gui_basics_8a6da59c.o \ -- $(OBJDIR)/juce_gui_extra_4a026f23.o \ - - .PHONY: clean - -@@ -112,11 +107,11 @@ - -@mkdir -p $(BINDIR) - -@mkdir -p $(LIBDIR) - -@mkdir -p $(OUTDIR) -- @$(BLDCMD) -+ $(BLDCMD) - - clean: - @echo Cleaning Projucer -- @$(CLEANCMD) -+ $(CLEANCMD) - - strip: - @echo Stripping Projucer -@@ -125,276 +120,276 @@ - $(OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_AppearanceSettings.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_AutoUpdater.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_CommandLine.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_DocumentEditorComponent.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_GlobalPreferences.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_Main.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainWindow.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_MainWindow.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_OpenDocumentManager.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling projucer_CompileEngineClient.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling projucer_CompileEngineServer.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_SourceCodeEditor.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentTypeHandler.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ButtonDocument.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentDocument.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ColouredElement.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_PaintElement.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_PaintElementPath.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentLayoutEditor.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentOverlayComponent.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_EditingPanelBase.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_JucerDocumentEditor.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_PaintRoutineEditor.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_PaintRoutinePanel.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ResourceEditorPanel.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_TestComponent.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_BinaryResources.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentLayout.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_GeneratedCode.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_JucerDocument.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ObjectTypes.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_PaintRoutine.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_DependencyPathPropertyComponent.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_Module.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_Project.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ProjectExporter.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ProjectSaver.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ResourceFile.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_CodeHelpers.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_FileHelpers.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_Icons.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_JucerTreeViewBase.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_MiscUtilities.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ProjucerLookAndFeel.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_SlidingPanelComponent.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_StoredSettings.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_NewFileWizard.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_NewProjectWizardClasses.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling BinaryData.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling juce_core.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling juce_cryptography.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling juce_data_structures.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling juce_events.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling juce_graphics.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling juce_gui_basics.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling juce_gui_extra.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - -include $(OBJECTS:%.o=%.d) ---- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h -+++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h -@@ -50,7 +50,7 @@ - #endif - - #ifndef JUCE_LOG_ASSERTIONS -- #define JUCE_LOG_ASSERTIONS 1 -+// #define JUCE_LOG_ASSERTIONS 1 - #endif - - #ifndef JUCE_CHECK_MEMORY_LEAKS diff --git a/debian/patches/debian_make-projucer.patch b/debian/patches/debian_make-projucer.patch new file mode 100644 index 00000000..4db7764b --- /dev/null +++ b/debian/patches/debian_make-projucer.patch @@ -0,0 +1,426 @@ +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 + endif + ++LIBJUCE_PATH=../../../../debian/libbuilder/build/ ++ + ifeq ($(CONFIG),Debug) + BINDIR := build + LIBDIR := build +@@ -18,13 +20,13 @@ + TARGET_ARCH := -march=native + endif + +- 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 +- CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 +- CXXFLAGS += $(CFLAGS) -std=c++11 +- LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl ++ JUCE_CPPFLAGS := $(DEPFLAGS) -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) ++ JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 $(CFLAGS) ++ JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) ++ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS) + + TARGET := Projucer +- BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) ++ BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) + endif + +@@ -38,13 +40,13 @@ + TARGET_ARCH := -march=native + endif + +- 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 +- CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 +- CXXFLAGS += $(CFLAGS) -std=c++11 +- LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl ++ JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS) ++ JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 $(CFLAGS) ++ JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) ++ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS) + + TARGET := Projucer +- BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) ++ BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) + endif + +@@ -97,13 +99,6 @@ + $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \ + $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \ + $(OBJDIR)/BinaryData_ce4232d4.o \ +- $(OBJDIR)/juce_core_75b14332.o \ +- $(OBJDIR)/juce_cryptography_6de2ebff.o \ +- $(OBJDIR)/juce_data_structures_72d3da2c.o \ +- $(OBJDIR)/juce_events_d2be882c.o \ +- $(OBJDIR)/juce_graphics_9c18891e.o \ +- $(OBJDIR)/juce_gui_basics_8a6da59c.o \ +- $(OBJDIR)/juce_gui_extra_4a026f23.o \ + + .PHONY: clean + +@@ -112,11 +107,11 @@ + -@mkdir -p $(BINDIR) + -@mkdir -p $(LIBDIR) + -@mkdir -p $(OUTDIR) +- @$(BLDCMD) ++ $(BLDCMD) + + clean: + @echo Cleaning Projucer +- @$(CLEANCMD) ++ $(CLEANCMD) + + strip: + @echo Stripping Projucer +@@ -125,276 +120,276 @@ + $(OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_AppearanceSettings.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_AutoUpdater.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_CommandLine.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_DocumentEditorComponent.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_GlobalPreferences.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_Main.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainWindow.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_MainWindow.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_OpenDocumentManager.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling projucer_CompileEngineClient.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling projucer_CompileEngineServer.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_SourceCodeEditor.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ComponentTypeHandler.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ButtonDocument.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ComponentDocument.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ColouredElement.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_PaintElement.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_PaintElementPath.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ComponentLayoutEditor.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ComponentOverlayComponent.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_EditingPanelBase.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_JucerDocumentEditor.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_PaintRoutineEditor.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_PaintRoutinePanel.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ResourceEditorPanel.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_TestComponent.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_BinaryResources.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ComponentLayout.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_GeneratedCode.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_JucerDocument.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ObjectTypes.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_PaintRoutine.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_DependencyPathPropertyComponent.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_Module.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_Project.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ProjectExporter.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ProjectSaver.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ResourceFile.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_CodeHelpers.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_FileHelpers.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_Icons.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_JucerTreeViewBase.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_MiscUtilities.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ProjucerLookAndFeel.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_SlidingPanelComponent.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_StoredSettings.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_NewFileWizard.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_NewProjectWizardClasses.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling BinaryData.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling juce_core.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling juce_cryptography.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling juce_data_structures.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling juce_events.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling juce_graphics.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling juce_gui_basics.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling juce_gui_extra.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + -include $(OBJECTS:%.o=%.d) +--- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h +@@ -50,7 +50,7 @@ + #endif + + #ifndef JUCE_LOG_ASSERTIONS +- #define JUCE_LOG_ASSERTIONS 1 ++// #define JUCE_LOG_ASSERTIONS 1 + #endif + + #ifndef JUCE_CHECK_MEMORY_LEAKS diff --git a/debian/patches/debian_projucer-modulepath.patch b/debian/patches/debian_projucer-modulepath.patch new file mode 100644 index 00000000..fc5779c7 --- /dev/null +++ b/debian/patches/debian_projucer-modulepath.patch @@ -0,0 +1,18 @@ +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; + } + ++ File debian ("/usr/share/juce"); ++ if (isJuceFolder(debian)) ++ return debian.getChildFile ("modules"); ++ + return File(); + } diff --git a/debian/patches/introjucer-makegenerator.patch b/debian/patches/introjucer-makegenerator.patch deleted file mode 100644 index 560f1a4f..00000000 --- a/debian/patches/introjucer-makegenerator.patch +++ /dev/null @@ -1,121 +0,0 @@ -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 @@ - - void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const - { -- out << " CPPFLAGS := $(DEPFLAGS)"; -+ out << " JUCE_CPPFLAGS := $(DEPFLAGS)"; - writeDefineFlags (out, config); - writeHeaderPathFlags (out, config); -- out << newLine; -+ out << " $(CPPFLAGS)" -+ << newLine; - } - - void writeLinkerFlags (OutputStream& out, const BuildConfiguration& config) const - { -- out << " LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)"; -+ out << " JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)"; - - { - StringArray flags (makefileExtraLinkerFlags); -@@ -207,7 +208,8 @@ - if (libraries.size() != 0) - out << " -l" << replacePreprocessorTokens (config, libraries.joinIntoString (" -l")).trim(); - -- out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim() -+ out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim(); -+ out << " $(LDFLAGS)" - << newLine; - } - -@@ -236,7 +238,7 @@ - - writeCppFlags (out, config); - -- out << " CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)"; -+ out << " JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH)"; - - if (config.isDebug()) - out << " -g -ggdb"; -@@ -246,6 +248,7 @@ - - out << " -O" << config.getGCCOptimisationFlag() - << (" " + replacePreprocessorTokens (config, getExtraCompilerFlagsString())).trimEnd() -+ << " $(CFLAGS)" - << newLine; - - String cppStandardToUse (getCppStandardString()); -@@ -253,8 +256,9 @@ - if (cppStandardToUse.isEmpty()) - cppStandardToUse = "-std=c++11"; - -- out << " CXXFLAGS += $(CFLAGS) " -+ out << " JUCE_CXXFLAGS += $(JUCE_CFLAGS) " - << cppStandardToUse -+ << " $(CXXFLAGS)" - << newLine; - - writeLinkerFlags (out, config); -@@ -273,7 +277,7 @@ - if (projectType.isStaticLibrary()) - out << " BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS)" << newLine; - else -- out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine; -+ out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine; - - out << " CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)" << newLine - << "endif" << newLine -@@ -297,6 +301,14 @@ - << "# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!" << newLine - << newLine; - -+ out << "# build with \"V=1\" for verbose builds" << newLine -+ << "ifeq ($(V), 1)" << newLine -+ << "V_AT =" << newLine -+ << "else" << newLine -+ << "V_AT = @" << newLine -+ << "endif" << newLine -+ << newLine; -+ - out << "# (this disables dependency generation if multiple architectures are set)" << newLine - << "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine - << newLine; -@@ -319,12 +331,12 @@ - << "\t-@mkdir -p $(BINDIR)" << newLine - << "\t-@mkdir -p $(LIBDIR)" << newLine - << "\t-@mkdir -p $(OUTDIR)" << newLine -- << "\t@$(BLDCMD)" << newLine -+ << "\t$(V_AT)$(BLDCMD)" << newLine - << newLine; - - out << "clean:" << newLine - << "\t@echo Cleaning " << projectName << newLine -- << "\t@$(CLEANCMD)" << newLine -+ << "\t$(V_AT)$(CLEANCMD)" << newLine - << newLine; - - out << "strip:" << newLine -@@ -342,8 +354,8 @@ - << ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine - << "\t-@mkdir -p $(OBJDIR)" << newLine - << "\t@echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine -- << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t@$(CC) $(CFLAGS) -o \"$@\" -c \"$<\"" -- : "\t@$(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"") -+ << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t$(V_AT)$(CC) $(JUCE_CFLAGS) -o \"$@\" -c \"$<\"" -+ : "\t$(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o \"$@\" -c \"$<\"") - << newLine << newLine; - } - } diff --git a/debian/patches/projucer-makegenerator.patch b/debian/patches/projucer-makegenerator.patch new file mode 100644 index 00000000..560f1a4f --- /dev/null +++ b/debian/patches/projucer-makegenerator.patch @@ -0,0 +1,121 @@ +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 @@ + + void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const + { +- out << " CPPFLAGS := $(DEPFLAGS)"; ++ out << " JUCE_CPPFLAGS := $(DEPFLAGS)"; + writeDefineFlags (out, config); + writeHeaderPathFlags (out, config); +- out << newLine; ++ out << " $(CPPFLAGS)" ++ << newLine; + } + + void writeLinkerFlags (OutputStream& out, const BuildConfiguration& config) const + { +- out << " LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)"; ++ out << " JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)"; + + { + StringArray flags (makefileExtraLinkerFlags); +@@ -207,7 +208,8 @@ + if (libraries.size() != 0) + out << " -l" << replacePreprocessorTokens (config, libraries.joinIntoString (" -l")).trim(); + +- out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim() ++ out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim(); ++ out << " $(LDFLAGS)" + << newLine; + } + +@@ -236,7 +238,7 @@ + + writeCppFlags (out, config); + +- out << " CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)"; ++ out << " JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH)"; + + if (config.isDebug()) + out << " -g -ggdb"; +@@ -246,6 +248,7 @@ + + out << " -O" << config.getGCCOptimisationFlag() + << (" " + replacePreprocessorTokens (config, getExtraCompilerFlagsString())).trimEnd() ++ << " $(CFLAGS)" + << newLine; + + String cppStandardToUse (getCppStandardString()); +@@ -253,8 +256,9 @@ + if (cppStandardToUse.isEmpty()) + cppStandardToUse = "-std=c++11"; + +- out << " CXXFLAGS += $(CFLAGS) " ++ out << " JUCE_CXXFLAGS += $(JUCE_CFLAGS) " + << cppStandardToUse ++ << " $(CXXFLAGS)" + << newLine; + + writeLinkerFlags (out, config); +@@ -273,7 +277,7 @@ + if (projectType.isStaticLibrary()) + out << " BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS)" << newLine; + else +- out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine; ++ out << " BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine; + + out << " CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)" << newLine + << "endif" << newLine +@@ -297,6 +301,14 @@ + << "# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!" << newLine + << newLine; + ++ out << "# build with \"V=1\" for verbose builds" << newLine ++ << "ifeq ($(V), 1)" << newLine ++ << "V_AT =" << newLine ++ << "else" << newLine ++ << "V_AT = @" << newLine ++ << "endif" << newLine ++ << newLine; ++ + out << "# (this disables dependency generation if multiple architectures are set)" << newLine + << "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine + << newLine; +@@ -319,12 +331,12 @@ + << "\t-@mkdir -p $(BINDIR)" << newLine + << "\t-@mkdir -p $(LIBDIR)" << newLine + << "\t-@mkdir -p $(OUTDIR)" << newLine +- << "\t@$(BLDCMD)" << newLine ++ << "\t$(V_AT)$(BLDCMD)" << newLine + << newLine; + + out << "clean:" << newLine + << "\t@echo Cleaning " << projectName << newLine +- << "\t@$(CLEANCMD)" << newLine ++ << "\t$(V_AT)$(CLEANCMD)" << newLine + << newLine; + + out << "strip:" << newLine +@@ -342,8 +354,8 @@ + << ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine + << "\t-@mkdir -p $(OBJDIR)" << newLine + << "\t@echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine +- << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t@$(CC) $(CFLAGS) -o \"$@\" -c \"$<\"" +- : "\t@$(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"") ++ << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t$(V_AT)$(CC) $(JUCE_CFLAGS) -o \"$@\" -c \"$<\"" ++ : "\t$(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o \"$@\" -c \"$<\"") + << newLine << newLine; + } + } diff --git a/debian/patches/series b/debian/patches/series index 0764c5bf..b4bc4dae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,9 @@ 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