diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2018-12-25 14:17:29 -0500 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2018-12-25 14:17:29 -0500 |
commit | 6c2a7ddc74257d700db71999ec751c47d4287b95 (patch) | |
tree | 64ed1125a49eec4dfd082badc0bb269e59e9eb3b | |
parent | 4c933a1d018cdd4d9528441652794971a8a806bc (diff) | |
download | rockbox-6c2a7ddc74257d700db71999ec751c47d4287b95.tar.gz rockbox-6c2a7ddc74257d700db71999ec751c47d4287b95.zip |
build: Put all codec optiomization definitions in one place
It was already mostly there.
Change-Id: I24ff278d9bf18a54be4b67c3075d5ebbe7947f65
-rw-r--r-- | lib/rbcodec/codecs/codecs.make | 11 | ||||
-rw-r--r-- | lib/rbcodec/codecs/lib/libcodec.make | 10 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libmad/libmad.make | 10 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/libspeex.make | 14 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libwmavoice/libwmavoice.make | 8 |
5 files changed, 14 insertions, 39 deletions
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make index afb8396938..4602a56d2c 100644 --- a/lib/rbcodec/codecs/codecs.make +++ b/lib/rbcodec/codecs/codecs.make | |||
@@ -67,6 +67,7 @@ include $(RBCODECLIB_DIR)/codecs/libopus/libopus.make | |||
67 | 67 | ||
68 | # set CODECFLAGS per codec lib, since gcc takes the last -Ox and the last | 68 | # set CODECFLAGS per codec lib, since gcc takes the last -Ox and the last |
69 | # in a -ffoo -fno-foo pair, there is no need to filter them out | 69 | # in a -ffoo -fno-foo pair, there is no need to filter them out |
70 | $(CODECLIB) : CODECFLAGS += -O1 | ||
70 | $(A52LIB) : CODECFLAGS += -O1 | 71 | $(A52LIB) : CODECFLAGS += -O1 |
71 | $(ALACLIB) : CODECFLAGS += -O1 | 72 | $(ALACLIB) : CODECFLAGS += -O1 |
72 | $(ASAPLIB) : CODECFLAGS += -O1 | 73 | $(ASAPLIB) : CODECFLAGS += -O1 |
@@ -81,6 +82,7 @@ $(GBSLIB) : CODECFLAGS += -O2 | |||
81 | $(HESLIB) : CODECFLAGS += -O2 | 82 | $(HESLIB) : CODECFLAGS += -O2 |
82 | $(KSSLIB) : CODECFLAGS += -O2 | 83 | $(KSSLIB) : CODECFLAGS += -O2 |
83 | $(M4ALIB) : CODECFLAGS += -O3 | 84 | $(M4ALIB) : CODECFLAGS += -O3 |
85 | $(MADLIB) : CODECFLAGS += -O2 | ||
84 | $(MUSEPACKLIB) : CODECFLAGS += -O1 | 86 | $(MUSEPACKLIB) : CODECFLAGS += -O1 |
85 | $(NSFLIB) : CODECFLAGS += -O2 | 87 | $(NSFLIB) : CODECFLAGS += -O2 |
86 | $(OPUSLIB) : CODECFLAGS += -O2 | 88 | $(OPUSLIB) : CODECFLAGS += -O2 |
@@ -88,6 +90,7 @@ $(PCMSLIB) : CODECFLAGS += -O1 | |||
88 | $(RMLIB) : CODECFLAGS += -O3 | 90 | $(RMLIB) : CODECFLAGS += -O3 |
89 | $(SGCLIB) : CODECFLAGS += -O2 | 91 | $(SGCLIB) : CODECFLAGS += -O2 |
90 | $(SPCLIB) : CODECFLAGS += -O1 | 92 | $(SPCLIB) : CODECFLAGS += -O1 |
93 | $(SPEEXLIB) : CODECFLAGS += -O2 | ||
91 | $(TREMORLIB) : CODECFLAGS += -O2 | 94 | $(TREMORLIB) : CODECFLAGS += -O2 |
92 | $(TTALIB) : CODECFLAGS += -O2 | 95 | $(TTALIB) : CODECFLAGS += -O2 |
93 | $(VGMLIB) : CODECFLAGS += -O2 | 96 | $(VGMLIB) : CODECFLAGS += -O2 |
@@ -102,15 +105,18 @@ ifeq ($(ARCH),arch_arm) | |||
102 | # redo per arm generation | 105 | # redo per arm generation |
103 | $(ALACLIB) : CODECFLAGS += -O2 | 106 | $(ALACLIB) : CODECFLAGS += -O2 |
104 | $(AYLIB) : CODECFLAGS += -O1 | 107 | $(AYLIB) : CODECFLAGS += -O1 |
108 | $(EMU2413LIB) : CODECFLAGS += -O3 | ||
105 | $(GBSLIB) : CODECFLAGS += -O1 | 109 | $(GBSLIB) : CODECFLAGS += -O1 |
106 | $(HESLIB) : CODECFLAGS += -O1 | 110 | $(HESLIB) : CODECFLAGS += -O1 |
107 | $(KSSLIB) : CODECFLAGS += -O1 | 111 | $(KSSLIB) : CODECFLAGS += -O1 |
112 | $(MADLIB) : CODECFLAGS += -O1 | ||
108 | $(NSFLIB) : CODECFLAGS += -O1 | 113 | $(NSFLIB) : CODECFLAGS += -O1 |
114 | $(SPEEXLIB) : CODECFLAGS += -O2 | ||
109 | $(SGCLIB) : CODECFLAGS += -O1 | 115 | $(SGCLIB) : CODECFLAGS += -O1 |
110 | $(VGMLIB) : CODECFLAGS += -O1 | 116 | $(VGMLIB) : CODECFLAGS += -O1 |
111 | $(EMU2413LIB) : CODECFLAGS += -O3 | ||
112 | $(WAVPACKLIB) : CODECFLAGS += -O3 | 117 | $(WAVPACKLIB) : CODECFLAGS += -O3 |
113 | else ifeq ($(ARCH),arch_m68k) | 118 | else ifeq ($(ARCH),arch_m68k) |
119 | $(CODECLIB) : CODECFLAGS += -O2 | ||
114 | $(A52LIB) : CODECFLAGS += -O2 | 120 | $(A52LIB) : CODECFLAGS += -O2 |
115 | $(ASFLIB) : CODECFLAGS += -O3 | 121 | $(ASFLIB) : CODECFLAGS += -O3 |
116 | $(ATRACLIB) : CODECFLAGS += -O2 | 122 | $(ATRACLIB) : CODECFLAGS += -O2 |
@@ -124,6 +130,7 @@ else ifeq ($(ARCH),arch_mips) | |||
124 | endif | 130 | endif |
125 | 131 | ||
126 | ifeq ($(MEMORYSIZE),2) | 132 | ifeq ($(MEMORYSIZE),2) |
133 | $(CODECLIB) : CODECFLAGS += -Os | ||
127 | $(ASFLIB) : CODECFLAGS += -Os | 134 | $(ASFLIB) : CODECFLAGS += -Os |
128 | $(WMALIB) : CODECFLAGS += -Os | 135 | $(WMALIB) : CODECFLAGS += -Os |
129 | endif | 136 | endif |
@@ -152,7 +159,7 @@ $(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(TLSFLIB) $(SETJMPLIB) | |||
152 | $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a | 159 | $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a |
153 | $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a | 160 | $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a |
154 | $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a | 161 | $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a |
155 | $(CODECDIR)/alac.codec : $(CODECDIR)/libalac.a $(CODECDIR)/libm4a.a | 162 | $(CODECDIR)/alac.codec : $(CODECDIR)/libalac.a $(CODECDIR)/libm4a.a |
156 | $(CODECDIR)/aac.codec : $(CODECDIR)/libfaad.a $(CODECDIR)/libm4a.a | 163 | $(CODECDIR)/aac.codec : $(CODECDIR)/libfaad.a $(CODECDIR)/libm4a.a |
157 | $(CODECDIR)/shorten.codec : $(CODECDIR)/libffmpegFLAC.a | 164 | $(CODECDIR)/shorten.codec : $(CODECDIR)/libffmpegFLAC.a |
158 | $(CODECDIR)/ape-pre.map : $(CODECDIR)/libdemac-pre.a | 165 | $(CODECDIR)/ape-pre.map : $(CODECDIR)/libdemac-pre.a |
diff --git a/lib/rbcodec/codecs/lib/libcodec.make b/lib/rbcodec/codecs/lib/libcodec.make index 4931d36b74..0788dd6705 100644 --- a/lib/rbcodec/codecs/lib/libcodec.make +++ b/lib/rbcodec/codecs/lib/libcodec.make | |||
@@ -16,15 +16,7 @@ $(CODECLIB): $(CODECLIB_OBJ) | |||
16 | $(SILENT)$(shell rm -f $@) | 16 | $(SILENT)$(shell rm -f $@) |
17 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 17 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
18 | 18 | ||
19 | CODECLIBFLAGS = $(filter-out -O%,$(CODECFLAGS)) | 19 | CODECLIBFLAGS = $(CODECFLAGS) |
20 | |||
21 | ifeq ($(MEMORYSIZE),2) | ||
22 | CODECLIBFLAGS += -Os | ||
23 | else ifeq ($(ARCH),arch_m68k) | ||
24 | CODECLIBFLAGS += -O2 | ||
25 | else | ||
26 | CODECLIBFLAGS += -O1 | ||
27 | endif | ||
28 | 20 | ||
29 | # Do not use '-ffunction-sections' when compiling sdl-sim | 21 | # Do not use '-ffunction-sections' when compiling sdl-sim |
30 | ifneq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim) | 22 | ifneq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim) |
diff --git a/lib/rbcodec/codecs/libmad/libmad.make b/lib/rbcodec/codecs/libmad/libmad.make index 16b2bd76a9..fa6040d29a 100644 --- a/lib/rbcodec/codecs/libmad/libmad.make +++ b/lib/rbcodec/codecs/libmad/libmad.make | |||
@@ -11,17 +11,9 @@ | |||
11 | # (one for codec, one for mpegplayer) | 11 | # (one for codec, one for mpegplayer) |
12 | # so a little trickery is necessary | 12 | # so a little trickery is necessary |
13 | 13 | ||
14 | # Extract optimization level ('-O') from compile flags. Will be set later. | 14 | MADFLAGS = $(CODECFLAGS) -I$(RBCODECLIB_DIR)/codecs/libmad |
15 | MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(RBCODECLIB_DIR)/codecs/libmad | ||
16 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H -DHAVE_ASSERT_H | 15 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H -DHAVE_ASSERT_H |
17 | 16 | ||
18 | # libmad is faster on ARM-targets with -O1 than -O2 | ||
19 | ifeq ($(ARCH),arch_arm) | ||
20 | MADFLAGS += -O1 | ||
21 | else | ||
22 | MADFLAGS += -O2 | ||
23 | endif | ||
24 | |||
25 | # MPEGplayer | 17 | # MPEGplayer |
26 | MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER | 18 | MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER |
27 | 19 | ||
diff --git a/lib/rbcodec/codecs/libspeex/libspeex.make b/lib/rbcodec/codecs/libspeex/libspeex.make index 6138dff4a9..c33fe1f9fa 100644 --- a/lib/rbcodec/codecs/libspeex/libspeex.make +++ b/lib/rbcodec/codecs/libspeex/libspeex.make | |||
@@ -13,21 +13,11 @@ | |||
13 | 13 | ||
14 | # disable strict aliasing optimizations for now, it gives warnings due to | 14 | # disable strict aliasing optimizations for now, it gives warnings due to |
15 | # some horrid typecasting | 15 | # some horrid typecasting |
16 | _SPEEXFLAGS = $(filter-out -fstrict-aliasing, $(CODECFLAGS)) \ | 16 | SPEEXFLAGS = $(filter-out -fstrict-aliasing, $(CODECFLAGS)) \ |
17 | -fno-strict-aliasing -DHAVE_CONFIG_H -DSPEEX_DISABLE_ENCODER \ | 17 | -fno-strict-aliasing -DHAVE_CONFIG_H -DSPEEX_DISABLE_ENCODER \ |
18 | -I$(RBCODECLIB_DIR)/codecs/libspeex | 18 | -I$(RBCODECLIB_DIR)/codecs/libspeex |
19 | 19 | ||
20 | # build voice codec with core -O switch | 20 | VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(SPEEXFLAGS))) -DROCKBOX_VOICE_CODEC |
21 | VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(_SPEEXFLAGS))) -DROCKBOX_VOICE_CODEC | ||
22 | |||
23 | # libspeex is faster on ARM-targets with -O1 instead of -O2 | ||
24 | SPEEXFLAGS = $(filter-out -O%,$(_SPEEXFLAGS)) | ||
25 | |||
26 | ifeq ($(ARCH),arch_arm) | ||
27 | SPEEXFLAGS += -O1 | ||
28 | else | ||
29 | SPEEXFLAGS += -O2 | ||
30 | endif | ||
31 | 21 | ||
32 | # libspeex | 22 | # libspeex |
33 | SPEEXLIB := $(CODECDIR)/libspeex.a | 23 | SPEEXLIB := $(CODECDIR)/libspeex.a |
diff --git a/lib/rbcodec/codecs/libwmavoice/libwmavoice.make b/lib/rbcodec/codecs/libwmavoice/libwmavoice.make index 609e5612f8..6aabc53a92 100644 --- a/lib/rbcodec/codecs/libwmavoice/libwmavoice.make +++ b/lib/rbcodec/codecs/libwmavoice/libwmavoice.make | |||
@@ -17,13 +17,7 @@ $(WMAVOICELIB): $(WMAVOICELIB_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 | 19 | ||
20 | WMAVOICEFLAGS = -I$(RBCODECLIB_DIR)/codecs/libwmavoice $(filter-out -O%,$(CODECFLAGS)) | 20 | WMAVOICEFLAGS = -I$(RBCODECLIB_DIR)/codecs/libwmavoice $(CODECFLAGS) |
21 | |||
22 | ifeq ($(ARCH),arch_m68k) | ||
23 | WMAVOICEFLAGS += -O2 | ||
24 | else | ||
25 | WMAVOICEFLAGS += -O1 | ||
26 | endif | ||
27 | 21 | ||
28 | ifeq ($(APP_TYPE),sdl-sim) | 22 | ifeq ($(APP_TYPE),sdl-sim) |
29 | # wmavoice needs libm in the simulator | 23 | # wmavoice needs libm in the simulator |