Merge pull request #20 from dumganhar/mp3-ogg-decoder

Disable ASM for tremolo since it may crashes while decoding same specific ogg audio files.
This commit is contained in:
Wang Nan 2017-01-20 16:34:22 +08:00 committed by GitHub
commit b2f3f03fae
1 changed files with 14 additions and 13 deletions

View File

@ -16,21 +16,22 @@ LOCAL_SRC_FILES = \
Tremolo/treminfo.c \
Tremolo/vorbisfile.c
ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES += \
Tremolo/bitwiseARM.s \
Tremolo/dpen.s \
Tremolo/floor1ARM.s \
Tremolo/mdctARM.s
LOCAL_CFLAGS += \
-D_ARM_ASSEM_
# Assembly code in asm_arm.h does not compile with Clang.
LOCAL_CLANG_ASFLAGS_arm += \
-no-integrated-as
else
# Disable arm optimization which will cause the issue https://github.com/cocos2d/cocos2d-x/issues/17148
# ifeq ($(TARGET_ARCH),arm)
# LOCAL_SRC_FILES += \
# Tremolo/bitwiseARM.s \
# Tremolo/dpen.s \
# Tremolo/floor1ARM.s \
# Tremolo/mdctARM.s
# LOCAL_CFLAGS += \
# -D_ARM_ASSEM_
# # Assembly code in asm_arm.h does not compile with Clang.
# LOCAL_CLANG_ASFLAGS_arm += \
# -no-integrated-as
# else
LOCAL_CFLAGS += \
-DONLY_C
endif
# endif
LOCAL_CFLAGS+= -O2
LOCAL_C_INCLUDES:= \