Skip to content

Commit

Permalink
Fixed indent, patch from Sylvain
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Oct 23, 2017
1 parent 0aaafac commit faad20d
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 71 deletions.
14 changes: 7 additions & 7 deletions Android.mk
View file
Expand Up @@ -66,16 +66,16 @@ LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES := SDL2

ifeq ($(SUPPORT_FLAC),true)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/include
LOCAL_CFLAGS += -DMUSIC_FLAC
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/include
LOCAL_CFLAGS += -DMUSIC_FLAC
LOCAL_STATIC_LIBRARIES += libFLAC
endif

ifeq ($(SUPPORT_OGG),true)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(OGG_LIBRARY_PATH)/include
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(VORBIS_LIBRARY_PATH)
LOCAL_CFLAGS += -DMUSIC_OGG -DOGG_USE_TREMOR -DOGG_HEADER="<ivorbisfile.h>"
LOCAL_STATIC_LIBRARIES += ogg vorbisidec
LOCAL_STATIC_LIBRARIES += ogg vorbisidec
endif

# This needs to be a shared library to comply with the LGPL license
Expand All @@ -89,13 +89,13 @@ ifeq ($(SUPPORT_MOD_MODPLUG),true)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/src
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/src/libmodplug
LOCAL_CFLAGS += -DMUSIC_MOD_MODPLUG -DMODPLUG_HEADER="<modplug.h>"
LOCAL_STATIC_LIBRARIES += modplug
LOCAL_STATIC_LIBRARIES += modplug
endif

ifeq ($(SUPPORT_TIMIDITY),true)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)
LOCAL_CFLAGS += -DMUSIC_MID_TIMIDITY
LOCAL_STATIC_LIBRARIES += timidity
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)
LOCAL_CFLAGS += -DMUSIC_MID_TIMIDITY
LOCAL_STATIC_LIBRARIES += timidity
endif

LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)
Expand Down
8 changes: 4 additions & 4 deletions external/flac-1.3.2/Android.mk
View file
Expand Up @@ -39,10 +39,10 @@ LOCAL_SRC_FILES := \
src/libFLAC/stream_encoder_intrin_avx2.c \
src/libFLAC/stream_encoder_framing.c \
src/libFLAC/window.c \
src/libFLAC/ogg_decoder_aspect.c \
src/libFLAC/ogg_encoder_aspect.c \
src/libFLAC/ogg_helper.c \
src/libFLAC/ogg_mapping.c
src/libFLAC/ogg_decoder_aspect.c \
src/libFLAC/ogg_encoder_aspect.c \
src/libFLAC/ogg_helper.c \
src/libFLAC/ogg_mapping.c

LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)

Expand Down
2 changes: 1 addition & 1 deletion external/libvorbisidec-1.2.1/Android.mk
View file
Expand Up @@ -9,7 +9,7 @@ LOCAL_C_INCLUDES :=
LOCAL_CFLAGS :=

ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -D_ARM_ASSEM_
LOCAL_CFLAGS += -D_ARM_ASSEM_
endif

LOCAL_SRC_FILES += \
Expand Down
118 changes: 59 additions & 59 deletions external/mpg123-1.25.6/Android.mk
View file
Expand Up @@ -13,65 +13,65 @@ DECODER_CFLAGS_NEON := -DOPT_NEON -DREAL_IS_FLOAT

DECODER_SRC_NEON := \
src/libmpg123/stringbuf.c \
src/libmpg123/icy.c \
src/libmpg123/icy2utf8.c \
src/libmpg123/ntom.c \
src/libmpg123/synth.c \
src/libmpg123/synth_8bit.c \
src/libmpg123/layer1.c \
src/libmpg123/layer2.c \
src/libmpg123/layer3.c \
src/libmpg123/dct36_neon.S \
src/libmpg123/dct64_neon_float.S \
src/libmpg123/synth_neon_float.S \
src/libmpg123/synth_neon_s32.S \
src/libmpg123/synth_stereo_neon_float.S \
src/libmpg123/synth_stereo_neon_s32.S \
src/libmpg123/dct64_neon.S \
src/libmpg123/synth_neon.S \
src/libmpg123/synth_stereo_neon.S \
src/libmpg123/synth_s32.c \
src/libmpg123/synth_real.c \
src/libmpg123/feature.c \
src/libmpg123/icy.c \
src/libmpg123/icy2utf8.c \
src/libmpg123/ntom.c \
src/libmpg123/synth.c \
src/libmpg123/synth_8bit.c \
src/libmpg123/layer1.c \
src/libmpg123/layer2.c \
src/libmpg123/layer3.c \
src/libmpg123/dct36_neon.S \
src/libmpg123/dct64_neon_float.S \
src/libmpg123/synth_neon_float.S \
src/libmpg123/synth_neon_s32.S \
src/libmpg123/synth_stereo_neon_float.S \
src/libmpg123/synth_stereo_neon_s32.S \
src/libmpg123/dct64_neon.S \
src/libmpg123/synth_neon.S \
src/libmpg123/synth_stereo_neon.S \
src/libmpg123/synth_s32.c \
src/libmpg123/synth_real.c \
src/libmpg123/feature.c \

DECODER_CFLAGS_X86 := -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOW_VINTAGE -DOPT_3DNOWEXT -DOPT_3DNOWEXT_VINTAGE -DOPT_SSE -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT

DECODER_SRC_X86 := \
src/libmpg123/stringbuf.c \
src/libmpg123/icy.c \
src/libmpg123/icy2utf8.c \
src/libmpg123/ntom.c \
src/libmpg123/synth.c \
src/libmpg123/synth_8bit.c \
src/libmpg123/layer1.c \
src/libmpg123/layer2.c \
src/libmpg123/layer3.c \
src/libmpg123/synth_s32.c \
src/libmpg123/synth_real.c \
src/libmpg123/dct64_i386.c \
src/libmpg123/synth_i586.S \
src/libmpg123/synth_i586_dither.S \
src/libmpg123/dct64_mmx.S \
src/libmpg123/tabinit_mmx.S \
src/libmpg123/synth_mmx.S \
src/libmpg123/synth_3dnow.S \
src/libmpg123/dct64_3dnow.S \
src/libmpg123/equalizer_3dnow.S \
src/libmpg123/dct36_3dnow.S \
src/libmpg123/dct64_3dnowext.S \
src/libmpg123/synth_3dnowext.S \
src/libmpg123/dct36_3dnowext.S \
src/libmpg123/dct64_sse_float.S \
src/libmpg123/synth_sse_float.S \
src/libmpg123/synth_stereo_sse_float.S \
src/libmpg123/synth_sse_s32.S \
src/libmpg123/synth_stereo_sse_s32.S \
src/libmpg123/dct36_sse.S \
src/libmpg123/dct64_sse.S \
src/libmpg123/synth_sse.S \
src/libmpg123/getcpuflags.S \
src/libmpg123/dither.c \
src/libmpg123/feature.c \
src/libmpg123/icy.c \
src/libmpg123/icy2utf8.c \
src/libmpg123/ntom.c \
src/libmpg123/synth.c \
src/libmpg123/synth_8bit.c \
src/libmpg123/layer1.c \
src/libmpg123/layer2.c \
src/libmpg123/layer3.c \
src/libmpg123/synth_s32.c \
src/libmpg123/synth_real.c \
src/libmpg123/dct64_i386.c \
src/libmpg123/synth_i586.S \
src/libmpg123/synth_i586_dither.S \
src/libmpg123/dct64_mmx.S \
src/libmpg123/tabinit_mmx.S \
src/libmpg123/synth_mmx.S \
src/libmpg123/synth_3dnow.S \
src/libmpg123/dct64_3dnow.S \
src/libmpg123/equalizer_3dnow.S \
src/libmpg123/dct36_3dnow.S \
src/libmpg123/dct64_3dnowext.S \
src/libmpg123/synth_3dnowext.S \
src/libmpg123/dct36_3dnowext.S \
src/libmpg123/dct64_sse_float.S \
src/libmpg123/synth_sse_float.S \
src/libmpg123/synth_stereo_sse_float.S \
src/libmpg123/synth_sse_s32.S \
src/libmpg123/synth_stereo_sse_s32.S \
src/libmpg123/dct36_sse.S \
src/libmpg123/dct64_sse.S \
src/libmpg123/synth_sse.S \
src/libmpg123/getcpuflags.S \
src/libmpg123/dither.c \
src/libmpg123/feature.c \

ifeq ($(TARGET_ARCH_ABI),armeabi)
DECODER_CFLAGS := $(DECODER_CFLAGS_NEON)
Expand All @@ -90,15 +90,15 @@ LOCAL_CFLAGS := $(DECODER_CFLAGS)

LOCAL_SRC_FILES := \
src/libmpg123/parse.c \
src/libmpg123/frame.c \
src/libmpg123/frame.c \
src/libmpg123/format.c \
src/libmpg123/dct64.c \
src/libmpg123/dct64.c \
src/libmpg123/equalizer.c \
src/libmpg123/id3.c \
src/libmpg123/id3.c \
src/libmpg123/optimize.c \
src/libmpg123/readers.c \
src/libmpg123/readers.c \
src/libmpg123/tabinit.c \
src/libmpg123/libmpg123.c \
src/libmpg123/libmpg123.c \
src/libmpg123/index.c \
src/compat/compat_str.c \
src/compat/compat.c \
Expand Down

0 comments on commit faad20d

Please sign in to comment.