Annotation of /trunk/gpac/patches/gpac-0.4.5-x11-link.patch
Parent Directory | Revision Log
Revision 925 -
(hide annotations)
(download)
Wed Nov 4 15:18:09 2009 UTC (14 years, 10 months ago) by niro
File size: 872 byte(s)
Wed Nov 4 15:18:09 2009 UTC (14 years, 10 months ago) by niro
File size: 872 byte(s)
-fixes for 0.4.5-r1
1 | niro | 925 | Index: gpac/modules/x11_out/Makefile |
2 | =================================================================== | ||
3 | --- gpac.orig/modules/x11_out/Makefile | ||
4 | +++ gpac/modules/x11_out/Makefile | ||
5 | @@ -34,19 +34,19 @@ endif | ||
6 | |||
7 | ifeq ($(USE_X11_XV), yes) | ||
8 | CFLAGS+=-DGPAC_HAS_X11_XV | ||
9 | -LDFLAGS+=-lXv | ||
10 | +LDLIBS+=-lXv | ||
11 | endif | ||
12 | |||
13 | ifeq ($(USE_X11_SHM), yes) | ||
14 | CFLAGS+=-DGPAC_HAS_X11_SHM | ||
15 | -LDFLAGS+=-lXext | ||
16 | +LDLIBS+=-lXext | ||
17 | endif | ||
18 | |||
19 | ifeq ($(HAS_OPENGL), yes) | ||
20 | ifeq ($(GPAC_USE_TINYGL), yes) | ||
21 | else | ||
22 | #CFLAGS +=-DGPAC_HAS_OPENGL | ||
23 | -LDFLAGS+=-lGL | ||
24 | +LDLIBS+=-lGL | ||
25 | #LDFLAGS+=-lTinyGL -L$(SRC_PATH)../../TinyGL/lib/ | ||
26 | endif | ||
27 | endif | ||
28 | @@ -71,7 +71,7 @@ all: $(LIB) | ||
29 | |||
30 | |||
31 | $(LIB): $(OBJSPIC) | ||
32 | - $(CC) $(SHFLAGS) $(LDFLAGS) -lX11 -L../../bin/gcc -lgpac -o ../../bin/gcc/$@ $(OBJSPIC) | ||
33 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -lX11 -L../../bin/gcc -lgpac $(LDLIBS) | ||
34 | |||
35 | %.o: %.c | ||
36 | $(CC) $(CFLAGS) -c -o $@ $< |