diff options
Diffstat (limited to 'apps/codecs')
27 files changed, 58 insertions, 275 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 19ff60ba3a..1644ff0e91 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -55,6 +55,64 @@ include $(APPSDIR)/codecs/libgme/libkss.make | |||
55 | CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ | 55 | CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ |
56 | -I$(APPSDIR)/codecs/lib -DCODEC | 56 | -I$(APPSDIR)/codecs/lib -DCODEC |
57 | 57 | ||
58 | # set CODECFLAGS per codec lib, since gcc takes the last -Ox and the last | ||
59 | # in a -ffoo -fno-foo pair, there is no need to filter them out | ||
60 | $(A52LIB) : CODECFLAGS += -O1 | ||
61 | $(ALACLIB) : CODECFLAGS += -O1 | ||
62 | $(ASAPLIB) : CODECFLAGS += -O1 | ||
63 | $(ASFLIB) : CODECFLAGS += -O2 | ||
64 | $(ATRACLIB) : CODECFLAGS += -O1 | ||
65 | $(AYLIB) : CODECFLAGS += -fno-strict-aliasing -O2 | ||
66 | $(COOKLIB): CODECFLAGS += -O1 | ||
67 | $(DEMACLIB) : CODECFLAGS += -O3 | ||
68 | $(FAADLIB) : CODECFLAGS += -O2 | ||
69 | $(FFMPEGFLACLIB) : CODECFLAGS += -O2 | ||
70 | $(GBSLIB) : CODECFLAGS += -fno-strict-aliasing -O2 | ||
71 | $(HESLIB) : CODECFLAGS += -fno-strict-aliasing -O2 | ||
72 | $(KSSLIB) : CODECFLAGS += -fno-strict-aliasing -O2 | ||
73 | $(M4ALIB) : CODECFLAGS += -O3 | ||
74 | $(MUSEPACKLIB) : CODECFLAGS += -O1 | ||
75 | $(NSFLIB) : CODECFLAGS += -fno-strict-aliasing -O2 | ||
76 | $(PCMSLIB) : CODECFLAGS += -O1 | ||
77 | $(RMLIB) : CODECFLAGS += -O3 | ||
78 | $(SGCLIB) : CODECFLAGS += -fno-strict-aliasing -O2 | ||
79 | $(SPCLIB) : CODECFLAGS += -fno-strict-aliasing -O1 | ||
80 | $(TREMORLIB) : CODECFLAGS += -O2 | ||
81 | $(TTALIB) : CODECFLAGS += -O2 | ||
82 | $(VGMLIB) : CODECFLAGS += -fno-strict-aliasing -O2 | ||
83 | $(WAVPACKLIB) : CODECFLAGS += -O1 | ||
84 | $(WMALIB) : CODECFLAGS += -O2 | ||
85 | $(WMAPROLIB) : CODECFLAGS += -O1 | ||
86 | $(WMAVOICELIB) : CODECFLAGS += -O1 | ||
87 | |||
88 | # fine-tuning of CODECFLAGS per cpu arch | ||
89 | ifeq ($(CPU),arm) | ||
90 | # redo per arm generation | ||
91 | $(ALACLIB) : CODECFLAGS += -O2 | ||
92 | $(AYLIB) : CODECFLAGS += -fno-strict-aliasing -O3 | ||
93 | $(GBSLIB) : CODECFLAGS += -fno-strict-aliasing -O3 | ||
94 | $(HESLIB) : CODECFLAGS += -fno-strict-aliasing -O3 | ||
95 | $(KSSLIB) : CODECFLAGS += -fno-strict-aliasing -O3 | ||
96 | $(NSFLIB) : CODECFLAGS += -fno-strict-aliasing -O3 | ||
97 | $(SGCLIB) : CODECFLAGS += -fno-strict-aliasing -O3 | ||
98 | $(VGMLIB) : CODECFLAGS += -fno-strict-aliasing -O3 | ||
99 | $(WAVPACKLIB) : CODECFLAGS += -O3 | ||
100 | else ifeq ($(CPU),coldfire) | ||
101 | $(A52LIB) : CODECFLAGS += -O2 | ||
102 | $(ASFLIB) : CODECFLAGS += -O3 | ||
103 | $(ATRACLIB) : CODECFLAGS += -O2 | ||
104 | $(COOKLIB): CODECFLAGS += -O2 | ||
105 | $(DEMACLIB) : CODECFLAGS += -O2 | ||
106 | $(TREMORLIB) : CODECFLAGS += -O3 | ||
107 | $(WMAPROLIB) : CODECFLAGS += -O3 | ||
108 | $(WMAVOICELIB) : CODECFLAGS += -O2 | ||
109 | endif | ||
110 | |||
111 | ifeq ($(MEMORYSIZE),2) | ||
112 | $(ASFLIB) : CODECFLAGS += -Os | ||
113 | $(WMALIB) : CODECFLAGS += -Os | ||
114 | endif | ||
115 | |||
58 | ifndef APP_TYPE | 116 | ifndef APP_TYPE |
59 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h | 117 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h |
60 | CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file | 118 | CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file |
diff --git a/apps/codecs/demac/libdemac.make b/apps/codecs/demac/libdemac.make index bf0f821de3..4614344849 100644 --- a/apps/codecs/demac/libdemac.make +++ b/apps/codecs/demac/libdemac.make | |||
@@ -26,14 +26,6 @@ $(DEMACLIB): $(DEMACLIB_OBJ) | |||
26 | $(SILENT)$(shell rm -f $@) | 26 | $(SILENT)$(shell rm -f $@) |
27 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 27 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
28 | 28 | ||
29 | DEMACFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
30 | |||
31 | ifeq ($(CPU),coldfire) | ||
32 | DEMACFLAGS += -O2 | ||
33 | else | ||
34 | DEMACFLAGS += -O3 | ||
35 | endif | ||
36 | |||
37 | $(CODECDIR)/ape_free_iram.h: $(CODECDIR)/ape-pre.map | 29 | $(CODECDIR)/ape_free_iram.h: $(CODECDIR)/ape-pre.map |
38 | $(call PRINTS,GEN $(@F))perl -an \ | 30 | $(call PRINTS,GEN $(@F))perl -an \ |
39 | -e 'if(/^PLUGIN_IRAM/){$$istart=hex($$F[1]);$$ilen=hex($$F[2])}' \ | 31 | -e 'if(/^PLUGIN_IRAM/){$$istart=hex($$F[1]);$$ilen=hex($$F[2])}' \ |
@@ -41,7 +33,3 @@ $(CODECDIR)/ape_free_iram.h: $(CODECDIR)/ape-pre.map | |||
41 | -e '}{if($$ilen){print"#define FREE_IRAM ".($$ilen+$$istart-$$iend)."\n";}' \ | 33 | -e '}{if($$ilen){print"#define FREE_IRAM ".($$ilen+$$istart-$$iend)."\n";}' \ |
42 | $(CODECDIR)/ape-pre.map \ | 34 | $(CODECDIR)/ape-pre.map \ |
43 | > $@ | 35 | > $@ |
44 | |||
45 | $(CODECDIR)/demac/%.o: $(ROOTDIR)/apps/codecs/demac/%.c | ||
46 | $(SILENT)mkdir -p $(dir $@) | ||
47 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(DEMACFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/liba52/liba52.make b/apps/codecs/liba52/liba52.make index c0fc7c8885..79b2eb222e 100644 --- a/apps/codecs/liba52/liba52.make +++ b/apps/codecs/liba52/liba52.make | |||
@@ -16,16 +16,3 @@ OTHER_SRC += $(A52LIB_SRC) | |||
16 | $(A52LIB): $(A52LIB_OBJ) | 16 | $(A52LIB): $(A52LIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | A52FLAGS = -I$(APPSDIR)/codecs/liba52 $(filter-out -O%,$(CODECFLAGS)) | ||
21 | |||
22 | ifeq ($(CPU),coldfire) | ||
23 | A52FLAGS += -O2 | ||
24 | else | ||
25 | A52FLAGS += -O1 | ||
26 | endif | ||
27 | |||
28 | $(CODECDIR)/liba52/%.o: $(ROOTDIR)/apps/codecs/liba52/%.c | ||
29 | $(SILENT)mkdir -p $(dir $@) | ||
30 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(A52FLAGS) -c $< -o $@ | ||
31 | |||
diff --git a/apps/codecs/libalac/libalac.make b/apps/codecs/libalac/libalac.make index b3b24cd2ee..a0300554c3 100644 --- a/apps/codecs/libalac/libalac.make +++ b/apps/codecs/libalac/libalac.make | |||
@@ -16,15 +16,3 @@ OTHER_SRC += $(ALACLIB_SRC) | |||
16 | $(ALACLIB): $(ALACLIB_OBJ) | 16 | $(ALACLIB): $(ALACLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | ALACFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
21 | |||
22 | ifeq ($(CPU),arm) | ||
23 | ALACFLAGS += -O2 | ||
24 | else | ||
25 | ALACFLAGS += -O1 | ||
26 | endif | ||
27 | |||
28 | $(CODECDIR)/libalac/%.o: $(ROOTDIR)/apps/codecs/libalac/%.c | ||
29 | $(SILENT)mkdir -p $(dir $@) | ||
30 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(ALACFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libasap/libasap.make b/apps/codecs/libasap/libasap.make index 8054648f3d..d904c14257 100644 --- a/apps/codecs/libasap/libasap.make +++ b/apps/codecs/libasap/libasap.make | |||
@@ -16,10 +16,3 @@ OTHER_SRC += $(ASAPLIB_SRC) | |||
16 | $(ASAPLIB): $(ASAPLIB_OBJ) | 16 | $(ASAPLIB): $(ASAPLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | ASAPFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
21 | ASAPFLAGS += -O1 | ||
22 | |||
23 | $(CODECDIR)/libasap/%.o: $(ROOTDIR)/apps/codecs/libasap/%.c | ||
24 | $(SILENT)mkdir -p $(dir $@) | ||
25 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(ASAPFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libasf/libasf.make b/apps/codecs/libasf/libasf.make index 52e338eb64..143d83f549 100644 --- a/apps/codecs/libasf/libasf.make +++ b/apps/codecs/libasf/libasf.make | |||
@@ -16,17 +16,3 @@ OTHER_SRC += $(ASFLIB_SRC) | |||
16 | $(ASFLIB): $(ASFLIB_OBJ) | 16 | $(ASFLIB): $(ASFLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | ASFFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
21 | |||
22 | ifeq ($(MEMORYSIZE),2) | ||
23 | ASFFLAGS += -Os | ||
24 | else ifeq ($(CPU),coldfire) | ||
25 | ASFFLAGS += -O3 | ||
26 | else | ||
27 | ASFFLAGS += -O2 | ||
28 | endif | ||
29 | |||
30 | $(CODECDIR)/libasf/%.o: $(ROOTDIR)/apps/codecs/libasf/%.c | ||
31 | $(SILENT)mkdir -p $(dir $@) | ||
32 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(ASFFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libatrac/libatrac.make b/apps/codecs/libatrac/libatrac.make index 980f5873f6..01606e1f15 100644 --- a/apps/codecs/libatrac/libatrac.make +++ b/apps/codecs/libatrac/libatrac.make | |||
@@ -16,16 +16,3 @@ OTHER_SRC += $(ATRACLIB_SRC) | |||
16 | $(ATRACLIB): $(ATRACLIB_OBJ) | 16 | $(ATRACLIB): $(ATRACLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | ATRACFLAGS = -I$(APPSDIR)/codecs/libatrac $(filter-out -O%,$(CODECFLAGS)) | ||
21 | # not tuned for arm | ||
22 | ifeq ($(CPU),coldfire) | ||
23 | ATRACFLAGS += -O2 | ||
24 | else | ||
25 | ATRACFLAGS += -O1 | ||
26 | endif | ||
27 | |||
28 | $(CODECDIR)/libatrac/%.o: $(ROOTDIR)/apps/codecs/libatrac/%.c | ||
29 | $(SILENT)mkdir -p $(dir $@) | ||
30 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(ATRACFLAGS) -c $< -o $@ | ||
31 | |||
diff --git a/apps/codecs/libcook/libcook.make b/apps/codecs/libcook/libcook.make index 6a2817e07c..c3f1c10319 100644 --- a/apps/codecs/libcook/libcook.make +++ b/apps/codecs/libcook/libcook.make | |||
@@ -16,16 +16,3 @@ OTHER_SRC += $(COOKLIB_SRC) | |||
16 | $(COOKLIB): $(COOKLIB_OBJ) | 16 | $(COOKLIB): $(COOKLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | COOKFLAGS = -I$(APPSDIR)/codecs/libcook $(filter-out -O%,$(CODECFLAGS)) | ||
21 | |||
22 | ifeq ($(CPU),coldfire) | ||
23 | COOKFLAGS += -O2 | ||
24 | else | ||
25 | COOKFLAGS += -O1 | ||
26 | endif | ||
27 | |||
28 | $(CODECDIR)/libcook/%.o: $(ROOTDIR)/apps/codecs/libcook/%.c | ||
29 | $(SILENT)mkdir -p $(dir $@) | ||
30 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(COOKFLAGS) -c $< -o $@ | ||
31 | |||
diff --git a/apps/codecs/libfaad/libfaad.make b/apps/codecs/libfaad/libfaad.make index a52e6f354a..4f5fbc322c 100644 --- a/apps/codecs/libfaad/libfaad.make +++ b/apps/codecs/libfaad/libfaad.make | |||
@@ -17,11 +17,3 @@ OTHER_INC += -I$(APPSDIR)/codecs/libfaad | |||
17 | $(FAADLIB): $(FAADLIB_OBJ) | 17 | $(FAADLIB): $(FAADLIB_OBJ) |
18 | $(SILENT)$(shell rm -f $@) | 18 | $(SILENT)$(shell rm -f $@) |
19 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 19 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
20 | |||
21 | # libfaad is faster on ARM with -O2, use -O1 for other CPUs | ||
22 | FAADFLAGS = -I$(APPSDIR)/codecs/libfaad $(filter-out -O%,$(CODECFLAGS)) | ||
23 | FAADFLAGS += -O2 | ||
24 | |||
25 | $(CODECDIR)/libfaad/%.o: $(ROOTDIR)/apps/codecs/libfaad/%.c | ||
26 | $(SILENT)mkdir -p $(dir $@) | ||
27 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(FAADFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make index 912538530a..734f3d2d8e 100644 --- a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make +++ b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make | |||
@@ -13,14 +13,6 @@ FFMPEGFLACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libffmpegFLAC/SOURCES) | |||
13 | FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC)) | 13 | FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC)) |
14 | OTHER_SRC += $(FFMPEGFLACLIB_SRC) | 14 | OTHER_SRC += $(FFMPEGFLACLIB_SRC) |
15 | 15 | ||
16 | # libffmpegFLAC is faster on ARM-targets with -O2 than -O1 | ||
17 | FFMPEGFLACFLAGS = -I$(APPSDIR)/codecs/libffmpegFLAC $(filter-out -O%,$(CODECFLAGS)) | ||
18 | FFMPEGFLACFLAGS += -O2 | ||
19 | |||
20 | $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ) | 16 | $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ) |
21 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
22 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
23 | |||
24 | $(CODECDIR)/libffmpegFLAC/%.o: $(ROOTDIR)/apps/codecs/libffmpegFLAC/%.c | ||
25 | $(SILENT)mkdir -p $(dir $@) | ||
26 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(FFMPEGFLACFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libgme/libay.make b/apps/codecs/libgme/libay.make index 5eee8ac1e4..0b5691c1f1 100644 --- a/apps/codecs/libgme/libay.make +++ b/apps/codecs/libgme/libay.make | |||
@@ -8,14 +8,3 @@ OTHER_SRC += $(AYLIB_SRC) | |||
8 | $(AYLIB): $(AYLIB_OBJ) | 8 | $(AYLIB): $(AYLIB_OBJ) |
9 | $(SILENT)$(shell rm -f $@) | 9 | $(SILENT)$(shell rm -f $@) |
10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
11 | |||
12 | AYFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_AY_TYPE | ||
13 | ifeq ($(CPU),arm) | ||
14 | AYFLAGS += -O3 | ||
15 | else | ||
16 | AYFLAGS += -O2 | ||
17 | endif | ||
18 | |||
19 | $(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c | ||
20 | $(SILENT)mkdir -p $(dir $@) | ||
21 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(AYFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libgme/libgbs.make b/apps/codecs/libgme/libgbs.make index cf6ff01274..6661a4994f 100644 --- a/apps/codecs/libgme/libgbs.make +++ b/apps/codecs/libgme/libgbs.make | |||
@@ -8,14 +8,3 @@ OTHER_SRC += $(GBSLIB_SRC) | |||
8 | $(GBSLIB): $(GBSLIB_OBJ) | 8 | $(GBSLIB): $(GBSLIB_OBJ) |
9 | $(SILENT)$(shell rm -f $@) | 9 | $(SILENT)$(shell rm -f $@) |
10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
11 | |||
12 | GBSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_GBS_TYPE | ||
13 | ifeq ($(CPU),arm) | ||
14 | GBSFLAGS += -O3 | ||
15 | else | ||
16 | GBSFLAGS += -O2 | ||
17 | endif | ||
18 | |||
19 | $(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c | ||
20 | $(SILENT)mkdir -p $(dir $@) | ||
21 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(GBSFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libgme/libhes.make b/apps/codecs/libgme/libhes.make index e0018565fb..81e29f8c5a 100644 --- a/apps/codecs/libgme/libhes.make +++ b/apps/codecs/libgme/libhes.make | |||
@@ -8,14 +8,3 @@ OTHER_SRC += $(HESLIB_SRC) | |||
8 | $(HESLIB): $(HESLIB_OBJ) | 8 | $(HESLIB): $(HESLIB_OBJ) |
9 | $(SILENT)$(shell rm -f $@) | 9 | $(SILENT)$(shell rm -f $@) |
10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
11 | |||
12 | HESFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_HES_TYPE | ||
13 | ifeq ($(CPU),arm) | ||
14 | HESFLAGS += -O3 | ||
15 | else | ||
16 | HESFLAGS += -O2 | ||
17 | endif | ||
18 | |||
19 | $(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c | ||
20 | $(SILENT)mkdir -p $(dir $@) | ||
21 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(HESFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libgme/libkss.make b/apps/codecs/libgme/libkss.make index 0e2dd54bc2..c93d8d169f 100644 --- a/apps/codecs/libgme/libkss.make +++ b/apps/codecs/libgme/libkss.make | |||
@@ -8,14 +8,3 @@ OTHER_SRC += $(KSSLIB_SRC) | |||
8 | $(KSSLIB): $(KSSLIB_OBJ) | 8 | $(KSSLIB): $(KSSLIB_OBJ) |
9 | $(SILENT)$(shell rm -f $@) | 9 | $(SILENT)$(shell rm -f $@) |
10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
11 | |||
12 | KSSFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_KSS_TYPE | ||
13 | ifeq ($(CPU),arm) | ||
14 | KSSFLAGS += -O3 | ||
15 | else | ||
16 | KSSFLAGS += -O2 | ||
17 | endif | ||
18 | |||
19 | $(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c | ||
20 | $(SILENT)mkdir -p $(dir $@) | ||
21 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(KSSFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libgme/libnsf.make b/apps/codecs/libgme/libnsf.make index 8b9df7526f..9ab171711a 100644 --- a/apps/codecs/libgme/libnsf.make +++ b/apps/codecs/libgme/libnsf.make | |||
@@ -8,14 +8,3 @@ OTHER_SRC += $(NSFLIB_SRC) | |||
8 | $(NSFLIB): $(NSFLIB_OBJ) | 8 | $(NSFLIB): $(NSFLIB_OBJ) |
9 | $(SILENT)$(shell rm -f $@) | 9 | $(SILENT)$(shell rm -f $@) |
10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
11 | |||
12 | NSFFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_NSF_TYPE | ||
13 | ifeq ($(CPU),arm) | ||
14 | NSFFLAGS += -O3 | ||
15 | else | ||
16 | NSFFLAGS += -O2 | ||
17 | endif | ||
18 | |||
19 | $(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c | ||
20 | $(SILENT)mkdir -p $(dir $@) | ||
21 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(NSFFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libgme/libsgc.make b/apps/codecs/libgme/libsgc.make index 0defe788c6..ddaec96081 100644 --- a/apps/codecs/libgme/libsgc.make +++ b/apps/codecs/libgme/libsgc.make | |||
@@ -8,14 +8,3 @@ OTHER_SRC += $(SGCLIB_SRC) | |||
8 | $(SGCLIB): $(SGCLIB_OBJ) | 8 | $(SGCLIB): $(SGCLIB_OBJ) |
9 | $(SILENT)$(shell rm -f $@) | 9 | $(SILENT)$(shell rm -f $@) |
10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
11 | |||
12 | SGCFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_SGC_TYPE | ||
13 | ifeq ($(CPU),arm) | ||
14 | SGCFLAGS += -O3 | ||
15 | else | ||
16 | SGCFLAGS += -O2 | ||
17 | endif | ||
18 | |||
19 | $(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c | ||
20 | $(SILENT)mkdir -p $(dir $@) | ||
21 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SGCFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libgme/libvgm.make b/apps/codecs/libgme/libvgm.make index f0e7cbb598..cc492d5143 100644 --- a/apps/codecs/libgme/libvgm.make +++ b/apps/codecs/libgme/libvgm.make | |||
@@ -8,14 +8,3 @@ OTHER_SRC += $(VGMLIB_SRC) | |||
8 | $(VGMLIB): $(VGMLIB_OBJ) | 8 | $(VGMLIB): $(VGMLIB_OBJ) |
9 | $(SILENT)$(shell rm -f $@) | 9 | $(SILENT)$(shell rm -f $@) |
10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 10 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
11 | |||
12 | VGMFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing -DGME_VGM_TYPE | ||
13 | ifeq ($(CPU),arm) | ||
14 | VGMFLAGS += -O3 | ||
15 | else | ||
16 | VGMFLAGS += -O2 | ||
17 | endif | ||
18 | |||
19 | $(CODECDIR)/libgme/%.o: $(ROOTDIR)/apps/codecs/libgme/%.c | ||
20 | $(SILENT)mkdir -p $(dir $@) | ||
21 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VGMFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libm4a/libm4a.make b/apps/codecs/libm4a/libm4a.make index 8b11fce32d..9a8a4cb74a 100644 --- a/apps/codecs/libm4a/libm4a.make +++ b/apps/codecs/libm4a/libm4a.make | |||
@@ -16,10 +16,3 @@ OTHER_SRC += $(M4ALIB_SRC) | |||
16 | $(M4ALIB): $(M4ALIB_OBJ) | 16 | $(M4ALIB): $(M4ALIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | M4AFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
21 | M4AFLAGS += -O3 | ||
22 | |||
23 | $(CODECDIR)/libm4a/%.o: $(ROOTDIR)/apps/codecs/libm4a/%.c | ||
24 | $(SILENT)mkdir -p $(dir $@) | ||
25 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(M4AFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libmusepack/libmusepack.make b/apps/codecs/libmusepack/libmusepack.make index 3a4127e9c4..ac201c4552 100644 --- a/apps/codecs/libmusepack/libmusepack.make +++ b/apps/codecs/libmusepack/libmusepack.make | |||
@@ -16,11 +16,3 @@ OTHER_SRC += $(MUSEPACKLIB_SRC) | |||
16 | $(MUSEPACKLIB): $(MUSEPACKLIB_OBJ) | 16 | $(MUSEPACKLIB): $(MUSEPACKLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | # libmusepack is faster on ARM-targets with -O1 than -O2 | ||
21 | MUSEPACKFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmusepack | ||
22 | MUSEPACKFLAGS += -O1 | ||
23 | |||
24 | $(CODECDIR)/libmusepack/%.o: $(ROOTDIR)/apps/codecs/libmusepack/%.c | ||
25 | $(SILENT)mkdir -p $(dir $@) | ||
26 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(MUSEPACKFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libpcm/libpcm.make b/apps/codecs/libpcm/libpcm.make index ce7b6b5083..1188bde1b0 100644 --- a/apps/codecs/libpcm/libpcm.make +++ b/apps/codecs/libpcm/libpcm.make | |||
@@ -16,10 +16,3 @@ OTHER_SRC += $(PCMSLIB_SRC) | |||
16 | $(PCMSLIB): $(PCMSLIB_OBJ) | 16 | $(PCMSLIB): $(PCMSLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | PCMSFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
21 | PCMSFLAGS += -O1 | ||
22 | |||
23 | $(CODECDIR)/libpcm/%.o: $(ROOTDIR)/apps/codecs/libpcm/%.c | ||
24 | $(SILENT)mkdir -p $(dir $@) | ||
25 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(PCMSFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/librm/librm.make b/apps/codecs/librm/librm.make index 99d89cdab7..7f2c34c9ac 100644 --- a/apps/codecs/librm/librm.make +++ b/apps/codecs/librm/librm.make | |||
@@ -16,10 +16,3 @@ OTHER_SRC += $(RMLIB_SRC) | |||
16 | $(RMLIB): $(RMLIB_OBJ) | 16 | $(RMLIB): $(RMLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | RMFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
21 | RMFLAGS += -O3 | ||
22 | |||
23 | $(CODECDIR)/librm/%.o: $(ROOTDIR)/apps/codecs/librm/%.c | ||
24 | $(SILENT)mkdir -p $(dir $@) | ||
25 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(RMFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libspc/libspc.make b/apps/codecs/libspc/libspc.make index 63360af1b1..8cf04dc5c8 100644 --- a/apps/codecs/libspc/libspc.make +++ b/apps/codecs/libspc/libspc.make | |||
@@ -16,10 +16,3 @@ OTHER_SRC += $(SPCLIB_SRC) | |||
16 | $(SPCLIB): $(SPCLIB_OBJ) | 16 | $(SPCLIB): $(SPCLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | SPCFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing | ||
21 | SPCFLAGS += -O1 | ||
22 | |||
23 | $(CODECDIR)/libspc/%.o: $(ROOTDIR)/apps/codecs/libspc/%.c | ||
24 | $(SILENT)mkdir -p $(dir $@) | ||
25 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPCFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libtremor/libtremor.make b/apps/codecs/libtremor/libtremor.make index e6816aa604..586c703346 100644 --- a/apps/codecs/libtremor/libtremor.make +++ b/apps/codecs/libtremor/libtremor.make | |||
@@ -16,16 +16,3 @@ OTHER_SRC += $(TREMORLIB_SRC) | |||
16 | $(TREMORLIB): $(TREMORLIB_OBJ) | 16 | $(TREMORLIB): $(TREMORLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | TREMORFLAGS = -I$(APPSDIR)/codecs/libtremor $(filter-out -O%,$(CODECFLAGS)) | ||
21 | |||
22 | # Tremor is slightly faster on coldfire with -O3 | ||
23 | ifeq ($(CPU),coldfire) | ||
24 | TREMORFLAGS += -O3 | ||
25 | else | ||
26 | TREMORFLAGS += -O2 | ||
27 | endif | ||
28 | |||
29 | $(CODECDIR)/libtremor/%.o: $(ROOTDIR)/apps/codecs/libtremor/%.c | ||
30 | $(SILENT)mkdir -p $(dir $@) | ||
31 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TREMORFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libtta/libtta.make b/apps/codecs/libtta/libtta.make index 7bd953e371..f8b7c650b2 100644 --- a/apps/codecs/libtta/libtta.make +++ b/apps/codecs/libtta/libtta.make | |||
@@ -16,14 +16,3 @@ OTHER_SRC += $(TTALIB_SRC) | |||
16 | $(TTALIB): $(TTALIB_OBJ) | 16 | $(TTALIB): $(TTALIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | TTAFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
21 | TTAFLAGS += -O2 | ||
22 | |||
23 | $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.c | ||
24 | $(SILENT)mkdir -p $(dir $@) | ||
25 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TTAFLAGS) -c $< -o $@ | ||
26 | |||
27 | $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.S | ||
28 | $(SILENT)mkdir -p $(dir $@) | ||
29 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TTAFLAGS) $(ASMFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libwavpack/libwavpack.make b/apps/codecs/libwavpack/libwavpack.make index 61430b55da..a2e5377418 100644 --- a/apps/codecs/libwavpack/libwavpack.make +++ b/apps/codecs/libwavpack/libwavpack.make | |||
@@ -13,19 +13,6 @@ WAVPACKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwavpack/SOURCES) | |||
13 | WAVPACKLIB_OBJ := $(call c2obj, $(WAVPACKLIB_SRC)) | 13 | WAVPACKLIB_OBJ := $(call c2obj, $(WAVPACKLIB_SRC)) |
14 | OTHER_SRC += $(WAVPACKLIB_SRC) | 14 | OTHER_SRC += $(WAVPACKLIB_SRC) |
15 | 15 | ||
16 | WAVPACKFLAGS = -I$(APPSDIR)/codecs/libwavpack $(filter-out -O%,$(CODECFLAGS)) | ||
17 | |||
18 | ifeq ($(CPU),arm) | ||
19 | WAVPACKFLAGS += -O3 | ||
20 | else | ||
21 | WAVPACKFLAGS += -O1 | ||
22 | endif | ||
23 | |||
24 | |||
25 | $(WAVPACKLIB): $(WAVPACKLIB_OBJ) | 16 | $(WAVPACKLIB): $(WAVPACKLIB_OBJ) |
26 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
27 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
28 | |||
29 | $(CODECDIR)/libwavpack/%.o: $(ROOTDIR)/apps/codecs/libwavpack/%.c | ||
30 | $(SILENT)mkdir -p $(dir $@) | ||
31 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(WAVPACKFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libwma/libwma.make b/apps/codecs/libwma/libwma.make index 66b315eca0..71c4cdc626 100644 --- a/apps/codecs/libwma/libwma.make +++ b/apps/codecs/libwma/libwma.make | |||
@@ -16,16 +16,3 @@ OTHER_SRC += $(WMALIB_SRC) | |||
16 | $(WMALIB): $(WMALIB_OBJ) | 16 | $(WMALIB): $(WMALIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | WMAFLAGS = -I$(APPSDIR)/codecs/libwma $(filter-out -O%,$(CODECFLAGS)) | ||
21 | |||
22 | ifeq ($(MEMORYSIZE),2) | ||
23 | WMAFLAGS += -Os | ||
24 | else | ||
25 | WMAFLAGS += -O2 | ||
26 | endif | ||
27 | |||
28 | $(CODECDIR)/libwma/%.o: $(ROOTDIR)/apps/codecs/libwma/%.c | ||
29 | $(SILENT)mkdir -p $(dir $@) | ||
30 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(WMAFLAGS) -c $< -o $@ | ||
31 | |||
diff --git a/apps/codecs/libwmapro/libwmapro.make b/apps/codecs/libwmapro/libwmapro.make index 4dc52fa15b..9177eafb20 100644 --- a/apps/codecs/libwmapro/libwmapro.make +++ b/apps/codecs/libwmapro/libwmapro.make | |||
@@ -16,15 +16,3 @@ OTHER_SRC += $(WMAPROLIB_SRC) | |||
16 | $(WMAPROLIB): $(WMAPROLIB_OBJ) | 16 | $(WMAPROLIB): $(WMAPROLIB_OBJ) |
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | |||
20 | WMAPROFLAGS = -I$(APPSDIR)/codecs/libwmapro $(filter-out -O%,$(CODECFLAGS)) | ||
21 | |||
22 | ifeq ($(CPU),coldfire) | ||
23 | WMAPROFLAGS += -O3 | ||
24 | else | ||
25 | WMAPROFLAGS += -O1 | ||
26 | endif | ||
27 | |||
28 | $(CODECDIR)/libwmapro/%.o: $(ROOTDIR)/apps/codecs/libwmapro/%.c | ||
29 | $(SILENT)mkdir -p $(dir $@) | ||
30 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(WMAPROFLAGS) -c $< -o $@ | ||