[SCM] juce/master: fix setting of FLAGS

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Sun Jan 31 07:55:48 UTC 2016


The following commit has been merged in the master branch:
commit 971bf4373d31b7d416506ef145989de9fc4f68a9
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Sat Jan 30 20:48:06 2016 +0100

    fix setting of FLAGS

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index a3b4ab9..119793e 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -72,30 +72,22 @@ JUCE_CPPFLAGS := $(DEPFLAGS) \
 	-D "NDEBUG=1" \
 	-D "DEBUG=0" \
 	-D "JUCE_DLL_BUILD=1" \
-	$(empty)
-#JUCE_CPPFLAGS := $(JUCE_CPPFLAGS)  \
-#	-D "JUCER_LINUX_MAKE_6D53C8B4=1" \
-#	-D "JUCE_APP_VERSION=1.0.0" \
-#	-D "JUCE_APP_VERSION_HEX=0x10000" \
-#	$(empty)
-JUCE_CPPFLAGS := $(JUCE_CPPFLAGS) \
 	$(JUCELIBS_CPPFLAGS) \
 	-I. \
 	$(empty)
-JUCE_CFLAGS += $(JUCE_CPPFLAGS) \
+
+JUCE_CFLAGS += \
 	$(TARGET_ARCH) \
 	-O3 \
 	-fPIC \
-	-fpermissive
-JUCE_CFLAGS+= $(JUCELIBS_CFLAGS)
-JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11
-JUCE_LDFLAGS += -rdynamic -shared -Wl,-soname,$(TARGET).$(SHORTSONAME)
-JUCE_LDFLAGS += $(TARGET_ARCH) \
-	-fPIC \
-	$(empty)
-#JUCE_LDFLAGS += -fvisibility=hidden
-JUCE_LDFLAGS+= $(JUCELIBS_LIBS)
+	-fpermissive \
+	$(JUCELIBS_CFLAGS)
+JUCE_CXXFLAGS += -std=c++11
 JUCE_LDFLAGS += \
+	-rdynamic -shared -Wl,-soname,$(TARGET).$(SHORTSONAME) \
+	$(TARGET_ARCH) \
+	-fPIC \
+	$(JUCELIBS_LIBS) \
 	-L$(BINDIR) \
 	-L$(LIBDIR) \
 	-ldl \

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list