[SCM] juce/master: use pkg-config for juce-flags
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Fri Jan 22 20:07:40 UTC 2016
The following commit has been merged in the master branch:
commit 1efb86f0cba68c3f70db0734ee63710853ed3c0a
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Fri Jan 22 06:15:45 2016 +0100
use pkg-config for juce-flags
diff --git a/debian/libbuilder/test/Makefile b/debian/libbuilder/test/Makefile
index 55cc33f..9255bde 100644
--- a/debian/libbuilder/test/Makefile
+++ b/debian/libbuilder/test/Makefile
@@ -23,13 +23,15 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native
endif
- CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DDEBUG=0 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
+ CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DDEBUG=0 -DJUCE_UNIT_TESTS=1
+-DJUCER_LINUX_MAKE_7346DA2A=1 -D "JUCE_APP_VERSION=3.0.0" -D
+"JUCE_APP_VERSION_HEX=0x30000" $(shell pkg-config --cflags juce) -I ../../JuceLibraryCode
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -fPIC
CXXFLAGS += $(CFLAGS) -std=c++11
LDFLAGS += $(TARGET_ARCH) -fPIC \
-L$(BINDIR) \
-L$(LIBDIR) \
- -ljuce \
+ $(shell pkg-config --libs juce)
-lGL
# LDFLAGS += \
# -lX11 \
@@ -56,14 +58,14 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native
endif
- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
+ CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" $(shell pkg-config --cflags juce) -I ../../JuceLibraryCode -I
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -fPIC
CXXFLAGS += $(CFLAGS) -std=c++11
LDFLAGS += $(TARGET_ARCH) -fPIC \
-fvisibility=hidden \
-L$(BINDIR) \
-L$(LIBDIR) \
- -ljuce \
+ $(shell pkg-config --libs juce)
-lGL
# LDFLAGS += \
# -lX11 \
--
juce packaging
More information about the pkg-multimedia-commits
mailing list