From 1211cd7dc9ed9e916411b16f84bdf3c217a617f3 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Fri, 22 Nov 2019 16:51:41 +0000 Subject: [PATCH] - updated patch for Projucer GPL mode git-svn-id: http://moon:8086/svn/software/trunk/projects/JaySynth@696 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- sdk/juce/JUCE-5.4.5.patch | 42 +++++++++++---------------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/sdk/juce/JUCE-5.4.5.patch b/sdk/juce/JUCE-5.4.5.patch index 6034c71..916ff2d 100644 --- a/sdk/juce/JUCE-5.4.5.patch +++ b/sdk/juce/JUCE-5.4.5.patch @@ -1,30 +1,12 @@ -diff -ruN temp/JUCE-5.4.5/extras/Projucer/Builds/LinuxMakefile/Makefile ./JUCE-5.4.5/extras/Projucer/Builds/LinuxMakefile/Makefile ---- temp/JUCE-5.4.5/extras/Projucer/Builds/LinuxMakefile/Makefile 2019-10-16 11:09:54.000000000 +0200 -+++ ./JUCE-5.4.5/extras/Projucer/Builds/LinuxMakefile/Makefile 2019-11-22 08:37:05.501409996 +0100 -@@ -24,6 +24,7 @@ - endif - - JUCE_ARCH_LABEL := $(shell uname -m) -+EXTRA_INCLUDES := -I/usr/include/freetype2 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 - - ifeq ($(CONFIG),Debug) - JUCE_BINDIR := build -@@ -35,7 +36,8 @@ - TARGET_ARCH := -march=native - endif - -- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) -+ -+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) $(EXTRA_INCLUDES) - JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 - JUCE_TARGET_APP := Projucer - -@@ -56,7 +58,7 @@ - TARGET_ARCH := -march=native - endif - -- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) -+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) $(EXTRA_INCLUDES) - JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 - JUCE_TARGET_APP := Projucer - +diff -ruN temp/JUCE-5.4.5/extras/Projucer/JuceLibraryCode/AppConfig.h ./JUCE-5.4.5/extras/Projucer/JuceLibraryCode/AppConfig.h +--- temp/JUCE-5.4.5/extras/Projucer/JuceLibraryCode/AppConfig.h 2019-10-16 11:09:54.000000000 +0200 ++++ ./JUCE-5.4.5/extras/Projucer/JuceLibraryCode/AppConfig.h 2019-11-22 17:50:31.911164178 +0100 +@@ -32,7 +32,7 @@ + // BEGIN SECTION A + + #ifndef JUCER_ENABLE_GPL_MODE +- #define JUCER_ENABLE_GPL_MODE 0 ++ #define JUCER_ENABLE_GPL_MODE 1 + #endif + + // END SECTION A