blob: 68763dc2e770df3d9a073b0a6eb15212159aa65b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
Index: mlt++-0.3.8/configure
===================================================================
--- mlt++-0.3.8.orig/configure
+++ mlt++-0.3.8/configure
@@ -40,13 +40,13 @@ case $targetos in
echo LIBSUF=.dylib
echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `pkg-config --cflags mlt-framework`"
echo "LIBFLAGS=-dynamiclib -single_module"
- echo "LDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs` `pkg-config mlt-valerie --libs`"
+ echo "OURLDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs` `pkg-config mlt-valerie --libs`"
;;
Linux|FreeBSD)
echo LIBSUF=.so
echo "CXXFLAGS+=-pthread -Wall $WARNINGS -fPIC `pkg-config --cflags mlt-framework`"
echo "LIBFLAGS=-shared"
- echo "LDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs`"
+ echo "OURLDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs`"
;;
esac >> config.mak
Index: mlt++-0.3.8/src/Makefile
===================================================================
--- mlt++-0.3.8.orig/src/Makefile
+++ mlt++-0.3.8/src/Makefile
@@ -43,7 +43,7 @@ HEADERS = config.h Mlt.h $(OBJS:.o=.h)
all: $(TARGET)
$(TARGET): $(OBJS)
- $(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+ $(CXX) $(LIBFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(OURLDFLAGS)
ln -sf $(TARGET) $(NAME)
ln -sf $(TARGET) $(SONAME)
Index: mlt++-0.3.8/test/Makefile
===================================================================
--- mlt++-0.3.8.orig/test/Makefile
+++ mlt++-0.3.8/test/Makefile
@@ -1,16 +1,19 @@
include ../config.mak
CXXFLAGS+=-Wall -g `pkg-config mlt-framework --cflags` -I ../src
-LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `pkg-config mlt-framework --libs`
+LDFLAGS+=-L../src
+OURLDFLAGS+=-lmlt++ -lmiracle -lvalerie `pkg-config mlt-framework --libs`
CC=c++
all: play server
play: play.o
+ $(CC) $(LDFLAGS) -o $@ $< $(OURLDFLAGS)
play.o: play.cpp
server: server.o
+ $(CC) $(LDFLAGS) -o $@ $< $(OURLDFLAGS)
server.o: server.cpp
|
GitWeb
