[SCM] juce/master: Fixed path to libjuce in test-build
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Sun Jan 24 21:40:47 UTC 2016
The following commit has been merged in the master branch:
commit 3e4edf5305287e1a14f090a0c7d55888ed52c3f3
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Sun Jan 24 22:40:38 2016 +0100
Fixed path to libjuce in test-build
also make one compiler and the linker command more verbose...
diff --git a/debian/patches/test-build b/debian/patches/test-build
index a870557..9ff08aa 100644
--- a/debian/patches/test-build
+++ b/debian/patches/test-build
@@ -25,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt
+ LDFLAGS += $(TARGET_ARCH) -fPIC \
+ -fvisibility=hidden \
-+ -L ../../../../debian/libbuilder -ljuce \
++ -L ../../../../debian/libbuilder/build -ljuce \
+ -L$(BINDIR) \
+ -L$(LIBDIR) \
+ -lGL
@@ -63,3 +63,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
.PHONY: clean
+@@ -113,7 +112,7 @@
+ - at mkdir -p $(BINDIR)
+ - at mkdir -p $(LIBDIR)
+ - at mkdir -p $(OUTDIR)
+- @$(BLDCMD)
++ $(BLDCMD)
+
+ clean:
+ @echo Cleaning JuceDemo
+@@ -126,7 +125,7 @@
+ $(OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp
+ - at mkdir -p $(OBJDIR)
+ @echo "Compiling Main.cpp"
+- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
++ $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+ $(OBJDIR)/MainWindow_499ac812.o: ../../Source/MainWindow.cpp
+ - at mkdir -p $(OBJDIR)
--
juce packaging
More information about the pkg-multimedia-commits
mailing list