]>
Commit | Line | Data |
---|---|---|
16219ea0 JB |
1 | --- gpac/applications/osmo4_wx/Makefile.orig 2012-06-17 07:51:02.389758176 +0200 |
2 | +++ gpac/applications/osmo4_wx/Makefile 2012-06-17 08:25:05.746339091 +0200 | |
3 | @@ -45,7 +45,7 @@ | |
a8c7bdfb JB |
4 | all: $(PROG) |
5 | ||
6 | Osmo4$(EXE): $(OBJS) | |
16219ea0 JB |
7 | - $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS) |
8 | + $(CXX) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) `pkg-config --libs gtk+-2.0` $(LINKFLAGS) | |
a8c7bdfb JB |
9 | |
10 | %.o: %.cpp | |
16219ea0 JB |
11 | $(CXX) $(CFLAGS) $(WX_CFLAGS) -c -o $@ $< |
12 | --- gpac/src/Makefile.orig 2012-05-23 20:57:42.000000000 +0200 | |
13 | +++ gpac/src/Makefile 2012-06-15 20:44:50.881728154 +0200 | |
14 | @@ -195,15 +195,6 @@ | |
15 | ## libgpac compositor compilation options | |
16 | COMPOSITOR_CFLAGS= | |
50f9b624 | 17 | |
16219ea0 | 18 | -## Add prefix before every lib |
50f9b624 AM |
19 | -ifneq ($(prefix), /usr/local) |
20 | -EXTRALIBS+=-L$(prefix)/lib | |
21 | -else | |
22 | -ifneq ($(prefix), /usr) | |
23 | -EXTRALIBS+=-L$(prefix)/lib | |
24 | -endif | |
25 | -endif | |
26 | - | |
16219ea0 JB |
27 | ## OpenGL available |
28 | ifeq ($(HAS_OPENGL),yes) | |
29 | EXTRALIBS+= $(OGL_LIBS) | |
30 | --- gpac/modules/jack/Makefile.orig 2012-04-05 14:38:11.000000000 +0200 | |
31 | +++ gpac/modules/jack/Makefile 2012-06-15 20:46:05.045058375 +0200 | |
32 | @@ -25,7 +25,7 @@ | |
50f9b624 AM |
33 | all: $(LIB) |
34 | ||
16219ea0 JB |
35 | $(LIB): $(OBJS) |
36 | - $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib -ljack | |
37 | + $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -ljack | |
50f9b624 AM |
38 | |
39 | ||
40 | %.o: %.c |