diff options
Diffstat (limited to 'apps/codecs/libFLAC')
-rw-r--r-- | apps/codecs/libFLAC/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/apps/codecs/libFLAC/Makefile b/apps/codecs/libFLAC/Makefile index 1c8b0682a7..9da55ba0e2 100644 --- a/apps/codecs/libFLAC/Makefile +++ b/apps/codecs/libFLAC/Makefile | |||
@@ -7,8 +7,9 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ |
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(APPSDIR)/codecs/libFLAC/include | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(APPSDIR)/codecs/libFLAC/include \ |
12 | -I$(BUILDDIR) | ||
12 | 13 | ||
13 | ifdef APPEXTRA | 14 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 15 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) |
@@ -16,9 +17,10 @@ endif | |||
16 | 17 | ||
17 | NEWGCC=$(shell expr $(GCCNUM) ">" 303) | 18 | NEWGCC=$(shell expr $(GCCNUM) ">" 303) |
18 | 19 | ||
19 | FLACOPTS = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA \ | 20 | FLACOPTS = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA \ |
20 | -DFLAC__INTEGER_ONLY_LIBRARY -DVERSION=\"1.1.2\" -fomit-frame-pointer \ | 21 | -DFLAC__INTEGER_ONLY_LIBRARY -DVERSION=\"1.1.2\" -fomit-frame-pointer \ |
21 | -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__ | 22 | -funroll-loops -finline-functions -Wall -W -Wno-inline \ |
23 | -DFLaC__INLINE=__inline__ | ||
22 | 24 | ||
23 | ifeq ($(NEWGCC), 1) | 25 | ifeq ($(NEWGCC), 1) |
24 | # this is 3.4.X options: | 26 | # this is 3.4.X options: |
@@ -37,7 +39,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
37 | DEPFILE = $(OBJDIR)/dep-libFLAC | 39 | DEPFILE = $(OBJDIR)/dep-libFLAC |
38 | DIRS = | 40 | DIRS = |
39 | 41 | ||
40 | OUTPUT = $(OBJDIR)/libFLAC.a | 42 | OUTPUT = $(BUILDDIR)/libFLAC.a |
41 | 43 | ||
42 | all: $(OUTPUT) | 44 | all: $(OUTPUT) |
43 | 45 | ||
@@ -47,7 +49,7 @@ $(OUTPUT): $(OBJS) | |||
47 | 49 | ||
48 | $(OBJDIR)/libFLAC/%.o: $(APPSDIR)/codecs/libFLAC/%.c | 50 | $(OBJDIR)/libFLAC/%.o: $(APPSDIR)/codecs/libFLAC/%.c |
49 | @mkdir -p $(OBJDIR)/libFLAC | 51 | @mkdir -p $(OBJDIR)/libFLAC |
50 | @echo "CC $<" | 52 | @echo "(libFLAC) CC $<" |
51 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libFLAC/include/FLAC $< -o $@ | 53 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libFLAC/include/FLAC $< -o $@ |
52 | 54 | ||
53 | include $(TOOLSDIR)/make.inc | 55 | include $(TOOLSDIR)/make.inc |