1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Index: apps/codecs/libspeex/libspeex.make
===================================================================
--- apps/codecs/libspeex/libspeex.make  (revision 29944)
+++ apps/codecs/libspeex/libspeex.make  (arbetskopia)
@@ -13,19 +13,22 @@
 
 # disable strict aliasing optimizations for now, it gives warnings due to
 # some horrid typecasting
-SPEEXFLAGS = $(filter-out -O%, $(filter-out -fstrict-aliasing, $(CODECFLAGS))) \
+_SPEEXFLAGS = $(filter-out -fstrict-aliasing, $(CODECFLAGS)) \
     -fno-strict-aliasing -DHAVE_CONFIG_H -DSPEEX_DISABLE_ENCODER \
     -I$(APPSDIR)/codecs/libspeex
 
+# build voice codec with core -O switch
+VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(_SPEEXFLAGS))) -DROCKBOX_VOICE_CODEC
+
 # libspeex is faster on ARM-targets with -O1 instead of -O2
+SPEEXFLAGS = $(filter-out -O%,$(_SPEEXFLAGS))
+
 ifeq ($(CPU),arm)
    SPEEXFLAGS += -O1
 else
    SPEEXFLAGS += -O2
 endif
 
-VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(SPEEXFLAGS))) -DROCKBOX_VOICE_CODEC
-
 # libspeex
 SPEEXLIB := $(CODECDIR)/libspeex.a
 SPEEXLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspeex/SOURCES)