projects / packages / gpac.git / blame
| Commit | Line | Data |
|---|---|---|
| ebe39204 AM |
1 | --- gpac-0.7.1/applications/osmo4_wx/Makefile~ 2018-09-17 12:18:34.000000000 +0200 |
| 2 | +++ gpac-0.7.1/applications/osmo4_wx/Makefile 2018-09-17 12:19:25.217933596 +0200 | |
| 3 | @@ -46,7 +46,7 @@ SRCS := $(OBJS:.o=.cpp) | |
| a8c7bdfb JB |
4 | all: $(PROG) |
| 5 | ||
| 6 | Osmo4$(EXE): $(OBJS) | |
| ebe39204 AM |
7 | - $(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS) $(LDFLAGS) |
| 8 | + $(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) `pkg-config --libs gtk+-2.0` -lstdc++ $(LINKFLAGS) $(LDFLAGS) | |
| a8c7bdfb | 9 | |
| ebe39204 AM |
10 | clean: |
| 11 | rm -f $(OBJS) ../../bin/gcc/$(PROG) | |
| 12 | --- gpac-0.7.1/modules/jack/Makefile~ 2017-04-26 13:33:17.000000000 +0200 | |
| 13 | +++ gpac-0.7.1/modules/jack/Makefile 2018-09-17 12:20:29.753236206 +0200 | |
| 14 | @@ -25,7 +25,7 @@ LIB=gm_jack$(DYN_LIB_SUFFIX) | |
| 50f9b624 AM |
15 | all: $(LIB) |
| 16 | ||
| 16219ea0 | 17 | $(LIB): $(OBJS) |
| ebe39204 AM |
18 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib -ljack |
| 19 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -ljack | |
| 50f9b624 | 20 | |
| ebe39204 AM |
21 | clean: |
| 22 | rm -f $(OBJS) ../../bin/gcc/$(LIB) |