updated Introjucer makefile

diff --git a/debian/patches/make-introjucer.patch b/debian/patches/make-introjucer.patch
index cb632b9ae9214025b206012223e67593824a16ee..a32122a21c3f252646cdd4e59b15e499363678f5 100644 (file)
--- 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\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 := \r
    endif\r
  \r
@@ -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)\r
 +  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare $(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
++  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(LIBJUCE_PATH) -ljuce_d $(LDFLAGS)\r
  \r
    TARGET := Introjucer\r
 -  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
@@ -25,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)\r
  endif\r
  \r
-@@ -38,13 +38,13 @@
+@@ -38,13 +40,13 @@
      TARGET_ARCH := \r
    endif\r
  \r
@@ -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)\r
 +  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare $(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
++  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L$(LIBJUCE_PATH) -ljuce  $(LDFLAGS)\r
  \r
    TARGET := Introjucer\r
 -  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
@@ -44,7 +53,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)\r
  endif\r
  \r
-@@ -110,11 +110,11 @@
+@@ -95,13 +97,6 @@
+   $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \\r
+   $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \\r
+   $(OBJDIR)/BinaryData_ce4232d4.o \\r
+-  $(OBJDIR)/juce_core_1ee54a40.o \\r
+-  $(OBJDIR)/juce_cryptography_3b1f489a.o \\r
+-  $(OBJDIR)/juce_data_structures_84790dfc.o \\r
+-  $(OBJDIR)/juce_events_584896b4.o \\r
+-  $(OBJDIR)/juce_graphics_f9afc18.o \\r
+-  $(OBJDIR)/juce_gui_basics_90929794.o \\r
+-  $(OBJDIR)/juce_gui_extra_b81d9e1c.o \\r
+ \r
+ .PHONY: clean\r
+ \r
+@@ -110,11 +105,11 @@
        -@mkdir -p $(BINDIR)\r
        -@mkdir -p $(LIBDIR)\r
        -@mkdir -p $(OUTDIR)\r
@@ -58,7 +81,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
  strip:\r
        @echo Stripping The Introjucer\r
-@@ -123,266 +123,266 @@
+@@ -123,266 +118,266 @@
  $(OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling jucer_AppearanceSettings.cpp"\r