diff options
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/Makefile | 31 | ||||
-rw-r--r-- | apps/codecs/Tremor/Makefile | 9 | ||||
-rw-r--r-- | apps/codecs/Tremor/config-tremor.h | 11 | ||||
-rw-r--r-- | apps/codecs/libFLAC/Makefile | 16 | ||||
-rw-r--r-- | apps/codecs/liba52/Makefile | 6 | ||||
-rw-r--r-- | apps/codecs/liba52/config-a52.h | 2 | ||||
-rw-r--r-- | apps/codecs/libmad/Makefile | 4 | ||||
-rw-r--r-- | apps/codecs/libwavpack/Makefile | 6 |
8 files changed, 45 insertions, 40 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 341e0e67c2..ffd8eab44d 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile | |||
@@ -8,7 +8,7 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ | 10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ |
11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib | 11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) |
12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
13 | -DMEM=${MEMORYSIZE} | 13 | -DMEM=${MEMORYSIZE} |
14 | 14 | ||
@@ -28,44 +28,45 @@ include $(TOOLSDIR)/make.inc | |||
28 | libmad: | 28 | libmad: |
29 | @echo "MAKE in libmad" | 29 | @echo "MAKE in libmad" |
30 | @mkdir -p $(OBJDIR)/libmad | 30 | @mkdir -p $(OBJDIR)/libmad |
31 | @$(MAKE) -C libmad TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libmad VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libmad.a | 31 | @$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a |
32 | 32 | ||
33 | liba52: | 33 | liba52: |
34 | @echo "MAKE in liba52" | 34 | @echo "MAKE in liba52" |
35 | @mkdir -p $(OBJDIR)/liba52 | 35 | @mkdir -p $(OBJDIR)/liba52 |
36 | @$(MAKE) -C liba52 TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/liba52 VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/liba52.a | 36 | @$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a |
37 | 37 | ||
38 | libFLAC: | 38 | libFLAC: |
39 | @echo "MAKE in libFLAC" | 39 | @echo "MAKE in libFLAC" |
40 | @mkdir -p $(OBJDIR)/libFLAC | 40 | @mkdir -p $(OBJDIR)/libFLAC |
41 | @$(MAKE) -C libFLAC TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libFLAC VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libFLAC.a | 41 | @$(MAKE) -C libFLAC OBJDIR=$(OBJDIR)/libFLAC OUTPUT=$(BUILDDIR)/libFLAC.a |
42 | 42 | ||
43 | libTremor: | 43 | libTremor: |
44 | @echo "MAKE in Tremor" | 44 | @echo "MAKE in Tremor" |
45 | @mkdir -p $(OBJDIR)/Tremor | 45 | @mkdir -p $(OBJDIR)/Tremor |
46 | @$(MAKE) -C Tremor TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/Tremor VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libTremor.a | 46 | @$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a |
47 | 47 | ||
48 | libwavpack: | 48 | libwavpack: |
49 | @echo "MAKE in libwavpack" | 49 | @echo "MAKE in libwavpack" |
50 | @mkdir -p $(OBJDIR)/libwavpack | 50 | @mkdir -p $(OBJDIR)/libwavpack |
51 | @$(MAKE) -C libwavpack TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libwavpack VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libwavpack.a | 51 | @$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a |
52 | 52 | ||
53 | dumb: | 53 | dumb: |
54 | @echo "MAKE in dumb" | 54 | @echo "MAKE in dumb" |
55 | @mkdir -p $(OBJDIR)/dumb | 55 | @mkdir -p $(OBJDIR)/dumb |
56 | @$(MAKE) -C dumb TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/dumb VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} LIBDIR=$(OBJDIR) OFLAGS="$(CFLAGS)" | 56 | @$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)" |
57 | 57 | ||
58 | libmusepack: | 58 | libmusepack: |
59 | @echo "MAKE in libmusepack" | 59 | @echo "MAKE in libmusepack" |
60 | @mkdir -p $(OBJDIR)/libmusepack | 60 | @mkdir -p $(OBJDIR)/libmusepack |
61 | @$(MAKE) -C libmusepack TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libmusepack VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libmusepack.a | 61 | @$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a |
62 | 62 | ||
63 | clean: | 63 | clean: |
64 | @echo "cleaning codecs" | 64 | @echo "cleaning codecs" |
65 | @rm -fr $(OBJDIR)/libmad $(OBJDIR)/libmad.a $(OBJDIR)/liba52 $(OBJDIR)/libFLAC $(OBJDIR)/Tremor $(OBJDIR)/libwavpack $(OBJDIR)/dumb $(OBJDIR)/libdumb.a $(OBJDIR)/libdumbd.a $(OBJDIR)/libmusepack $(OBJDIR)/libmusepack.a | 65 | $(SILENT)rm -fr $(OBJDIR)/libmad $(BUILDDIR)/libmad.a $(OBJDIR)/liba52 $(OBJDIR)/libFLAC $(OBJDIR)/Tremor $(OBJDIR)/libwavpack $(OBJDIR)/dumb $(BUILDDIR)/libdumb.a $(BUILDDIR)/libdumbd.a $(OBJDIR)/libmusepack $(BUILDDIR)/libmusepack.a |
66 | @$(MAKE) -C libmad clean | 66 | @$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad |
67 | @$(MAKE) -C liba52 clean | 67 | @$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52 |
68 | @$(MAKE) -C libFLAC clean | 68 | @$(MAKE) -C libFLAC clean OBJDIR=$(OBJDIR)/libFLAC |
69 | @$(MAKE) -C Tremor clean | 69 | @$(MAKE) -C Tremor clean OBJDIR=$(OBJDIR)/Tremor |
70 | @$(MAKE) -C libwavpack clean | 70 | @$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack |
71 | @$(MAKE) -C libmusepack clean | 71 | @$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack |
72 | @$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb | ||
diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile index 5e97c60534..20e30bbbf6 100644 --- a/apps/codecs/Tremor/Makefile +++ b/apps/codecs/Tremor/Makefile | |||
@@ -8,14 +8,15 @@ | |||
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 | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | TREMOROPTS = | 17 | TREMOROPTS = |
18 | CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 18 | CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | ||
19 | 20 | ||
20 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
21 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -26,7 +27,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-Tremor | 27 | DEPFILE = $(OBJDIR)/dep-Tremor |
27 | DIRS = | 28 | DIRS = |
28 | 29 | ||
29 | OUTPUT = $(OBJDIR)/libTremor.a | 30 | OUTPUT = $(BUILDDIR)/libTremor.a |
30 | 31 | ||
31 | all: $(OUTPUT) | 32 | all: $(OUTPUT) |
32 | 33 | ||
@@ -35,7 +36,7 @@ $(OUTPUT): $(OBJS) | |||
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 36 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 37 | ||
37 | $(OBJDIR)/Tremor/%.o: $(APPSDIR)/codecs/Tremor/%.c | 38 | $(OBJDIR)/Tremor/%.o: $(APPSDIR)/codecs/Tremor/%.c |
38 | @echo "CC $<" | 39 | @echo "(Tremor) CC $<" |
39 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/Tremor/ $< -o $@ | 40 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/Tremor/ $< -o $@ |
40 | 41 | ||
41 | include $(TOOLSDIR)/make.inc | 42 | include $(TOOLSDIR)/make.inc |
diff --git a/apps/codecs/Tremor/config-tremor.h b/apps/codecs/Tremor/config-tremor.h index e53c04898c..81aa5bffab 100644 --- a/apps/codecs/Tremor/config-tremor.h +++ b/apps/codecs/Tremor/config-tremor.h | |||
@@ -1,11 +1,12 @@ | |||
1 | #include "../codec.h" | 1 | #include "../codec.h" |
2 | 2 | ||
3 | #ifdef ROCKBOX_BIG_ENDIAN | ||
3 | #define BIG_ENDIAN 1 | 4 | #define BIG_ENDIAN 1 |
4 | #define LITTLE_ENDIAN 0 | 5 | #define LITTLE_ENDIAN 0 |
5 | #define _LOW_ACCURACY_ | 6 | #define BYTE_ORDER BIG_ENDIAN |
6 | |||
7 | #ifdef SIMULATOR | ||
8 | #define BYTE_ORDER LITTLE_ENDIAN | ||
9 | #else | 7 | #else |
10 | #define BYTE_ORDER BIG_ENDIAN | 8 | #define BYTE_ORDER LITTLE_ENDIAN |
9 | #define LITTLE_ENDIAN 1 | ||
10 | #define BIG_ENDIAN 0 | ||
11 | #endif | 11 | #endif |
12 | #define _LOW_ACCURACY_ | ||
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 |
diff --git a/apps/codecs/liba52/Makefile b/apps/codecs/liba52/Makefile index 7baa71feb0..b31903f492 100644 --- a/apps/codecs/liba52/Makefile +++ b/apps/codecs/liba52/Makefile | |||
@@ -8,7 +8,7 @@ | |||
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 | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) |
@@ -26,7 +26,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-liba52 | 26 | DEPFILE = $(OBJDIR)/dep-liba52 |
27 | DIRS = | 27 | DIRS = |
28 | 28 | ||
29 | OUTPUT = $(OBJDIR)/liba52.a | 29 | OUTPUT = $(BUILDDIR)/liba52.a |
30 | 30 | ||
31 | all: $(OUTPUT) | 31 | all: $(OUTPUT) |
32 | 32 | ||
@@ -35,7 +35,7 @@ $(OUTPUT): $(OBJS) | |||
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 36 | ||
37 | $(OBJDIR)/liba52/%.o: $(APPSDIR)/codecs/liba52/%.c | 37 | $(OBJDIR)/liba52/%.o: $(APPSDIR)/codecs/liba52/%.c |
38 | @echo "CC $<" | 38 | @echo "(liba52) CC $<" |
39 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/liba52/ $< -o $@ | 39 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/liba52/ $< -o $@ |
40 | 40 | ||
41 | include $(TOOLSDIR)/make.inc | 41 | include $(TOOLSDIR)/make.inc |
diff --git a/apps/codecs/liba52/config-a52.h b/apps/codecs/liba52/config-a52.h index 1aec4cda14..9e38034783 100644 --- a/apps/codecs/liba52/config-a52.h +++ b/apps/codecs/liba52/config-a52.h | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | /* Used in bitstream.h */ | 21 | /* Used in bitstream.h */ |
22 | 22 | ||
23 | #ifndef SIMULATOR | 23 | #ifdef ROCKBOX_BIG_ENDIAN |
24 | #define WORDS_BIGENDIAN 1 | 24 | #define WORDS_BIGENDIAN 1 |
25 | #endif | 25 | #endif |
26 | 26 | ||
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile index 74c726068e..1228cce16f 100644 --- a/apps/codecs/libmad/Makefile +++ b/apps/codecs/libmad/Makefile | |||
@@ -8,7 +8,7 @@ | |||
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 | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) |
@@ -34,7 +34,7 @@ $(OUTPUT): $(OBJS) | |||
34 | $(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | $(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | 35 | ||
36 | $(OBJDIR)/%.o: $(APPSDIR)/codecs/libmad/%.c | 36 | $(OBJDIR)/%.o: $(APPSDIR)/codecs/libmad/%.c |
37 | @echo "CC $<" | 37 | @echo "(libmad) CC "`basename $<` |
38 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmad/ $< -o $@ | 38 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmad/ $< -o $@ |
39 | 39 | ||
40 | include $(TOOLSDIR)/make.inc | 40 | include $(TOOLSDIR)/make.inc |
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile index 54d95be2c0..df26559f59 100644 --- a/apps/codecs/libwavpack/Makefile +++ b/apps/codecs/libwavpack/Makefile | |||
@@ -8,7 +8,7 @@ | |||
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 | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) |
@@ -26,7 +26,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-libwavpack | 26 | DEPFILE = $(OBJDIR)/dep-libwavpack |
27 | DIRS = | 27 | DIRS = |
28 | 28 | ||
29 | OUTPUT = $(OBJDIR)/libwavpack.a | 29 | OUTPUT = $(BUILDDIR)/libwavpack.a |
30 | 30 | ||
31 | all: $(OUTPUT) | 31 | all: $(OUTPUT) |
32 | 32 | ||
@@ -35,7 +35,7 @@ $(OUTPUT): $(OBJS) | |||
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 36 | ||
37 | $(OBJDIR)/libwavpack/%.o: $(APPSDIR)/codecs/libwavpack/%.c | 37 | $(OBJDIR)/libwavpack/%.o: $(APPSDIR)/codecs/libwavpack/%.c |
38 | @echo "CC $<" | 38 | @echo "(libwavpack) CC $<" |
39 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libwavpack/ $< -o $@ | 39 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libwavpack/ $< -o $@ |
40 | 40 | ||
41 | include $(TOOLSDIR)/make.inc | 41 | include $(TOOLSDIR)/make.inc |