From 6c2a7ddc74257d700db71999ec751c47d4287b95 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Tue, 25 Dec 2018 14:17:29 -0500
Subject: build:  Put all codec optiomization definitions in one place

It was already mostly there.

Change-Id: I24ff278d9bf18a54be4b67c3075d5ebbe7947f65
---
 lib/rbcodec/codecs/libspeex/libspeex.make | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'lib/rbcodec/codecs/libspeex')

diff --git a/lib/rbcodec/codecs/libspeex/libspeex.make b/lib/rbcodec/codecs/libspeex/libspeex.make
index 6138dff..c33fe1f 100644
--- a/lib/rbcodec/codecs/libspeex/libspeex.make
+++ b/lib/rbcodec/codecs/libspeex/libspeex.make
@@ -13,21 +13,11 @@
 
 # disable strict aliasing optimizations for now, it gives warnings due to
 # some horrid typecasting
-_SPEEXFLAGS = $(filter-out -fstrict-aliasing, $(CODECFLAGS)) \
+SPEEXFLAGS = $(filter-out -fstrict-aliasing, $(CODECFLAGS)) \
 		-fno-strict-aliasing -DHAVE_CONFIG_H -DSPEEX_DISABLE_ENCODER \
 		-I$(RBCODECLIB_DIR)/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 ($(ARCH),arch_arm)
-   SPEEXFLAGS += -O1
-else
-   SPEEXFLAGS += -O2
-endif
+VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(SPEEXFLAGS))) -DROCKBOX_VOICE_CODEC
 
 # libspeex
 SPEEXLIB := $(CODECDIR)/libspeex.a
-- 
cgit v1.1