]>
Commit | Line | Data |
---|---|---|
0f42ec7c JB |
1 | --- gpac/modules/amr_float_dec/Makefile.orig 2007-08-28 14:51:20.000000000 +0200 |
2 | +++ gpac/modules/amr_float_dec/Makefile 2011-03-27 21:37:20.585733920 +0200 | |
3 | @@ -18,19 +18,19 @@ | |
4 | #common obj | |
5 | OBJS=../amr_dec/amr_in.o amr_float_dec.o | |
6 | ||
7 | +AMR_LIBS= | |
8 | + | |
9 | #AMR NB obj | |
10 | CFLAGS+=-DGPAC_HAS_AMR_FT | |
11 | ifeq ($(CONFIG_AMR_NB_FT), yes) | |
12 | -OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o | |
13 | +AMR_LIBS=-lamrnb | |
14 | endif | |
15 | ||
16 | ||
17 | #AMR WB obj | |
18 | CFLAGS+=-DGPAC_HAS_AMR_FT_WB | |
19 | ifeq ($(CONFIG_AMR_WB_FT), yes) | |
20 | -OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \ | |
21 | - ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \ | |
22 | - ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o | |
23 | +AMR_LIBS=-lamrwb | |
24 | endif | |
25 | ||
26 | ||
27 | @@ -51,7 +51,7 @@ | |
28 | ||
29 | ||
30 | $(LIB): $(OBJSPIC) | |
31 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac | |
32 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac $(AMR_LIBS) | |
33 | ||
34 | ||
35 | %.o: %.c |