[SCM] juce/master: updated Introjucer makefile

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ead4dd0230a647c4c6a742c40e82f1f1931996c1
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Feb 10 21:21:07 2016 +0100

    updated Introjucer makefile

diff --git a/debian/patches/make-introjucer.patch b/debian/patches/make-introjucer.patch
index cb632b9..a32122a 100644
--- a/debian/patches/make-introjucer.patch
+++ b/debian/patches/make-introjucer.patch
@@ -6,7 +6,16 @@ Last-Update: 2015-01-29
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/extras/Introjucer/Builds/Linux/Makefile
 +++ juce/extras/Introjucer/Builds/Linux/Makefile
-@@ -18,13 +18,13 @@
+@@ -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 := 
    endif
  
@@ -17,7 +26,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)
 +  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare $(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)
++  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(LIBJUCE_PATH) -ljuce_d $(LDFLAGS)
  
    TARGET := Introjucer
 -  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
@@ -25,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
  endif
  
-@@ -38,13 +38,13 @@
+@@ -38,13 +40,13 @@
      TARGET_ARCH := 
    endif
  
@@ -36,7 +45,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)
 +  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare $(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)
++  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L$(LIBJUCE_PATH) -ljuce  $(LDFLAGS)
  
    TARGET := Introjucer
 -  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
@@ -44,7 +53,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
  endif
  
-@@ -110,11 +110,11 @@
+@@ -95,13 +97,6 @@
+   $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \
+   $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \
+   $(OBJDIR)/BinaryData_ce4232d4.o \
+-  $(OBJDIR)/juce_core_1ee54a40.o \
+-  $(OBJDIR)/juce_cryptography_3b1f489a.o \
+-  $(OBJDIR)/juce_data_structures_84790dfc.o \
+-  $(OBJDIR)/juce_events_584896b4.o \
+-  $(OBJDIR)/juce_graphics_f9afc18.o \
+-  $(OBJDIR)/juce_gui_basics_90929794.o \
+-  $(OBJDIR)/juce_gui_extra_b81d9e1c.o \
+ 
+ .PHONY: clean
+ 
+@@ -110,11 +105,11 @@
  	- at mkdir -p $(BINDIR)
  	- at mkdir -p $(LIBDIR)
  	- at mkdir -p $(OUTDIR)
@@ -58,7 +81,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  strip:
  	@echo Stripping The Introjucer
-@@ -123,266 +123,266 @@
+@@ -123,266 +118,266 @@
  $(OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp
  	- at mkdir -p $(OBJDIR)
  	@echo "Compiling jucer_AppearanceSettings.cpp"

-- 
juce packaging