Fixed building for Android armeabi
authorSam Lantinga <slouken@libsdl.org>
Sun, 22 Oct 2017 17:29:07 -0700
changeset 836f6a6026e7172
parent 835 4285a2d75921
child 837 c593f8bf25c3
Fixed building for Android armeabi
Android.mk
external/libvorbisidec-1.2.1.patch
external/libvorbisidec-1.2.1/Android.mk
     1.1 --- a/Android.mk	Sun Oct 22 17:32:31 2017 -0700
     1.2 +++ b/Android.mk	Sun Oct 22 17:29:07 2017 -0700
     1.3 @@ -60,6 +60,7 @@
     1.4  
     1.5  LOCAL_SRC_FILES := $(notdir $(filter-out %/playmus.c %/playwave.c, $(wildcard $(LOCAL_PATH)/*.c))) \
     1.6  
     1.7 +LOCAL_CFLAGS :=
     1.8  LOCAL_LDLIBS :=
     1.9  LOCAL_STATIC_LIBRARIES :=
    1.10  LOCAL_SHARED_LIBRARIES := SDL2
    1.11 @@ -97,6 +98,6 @@
    1.12  	LOCAL_STATIC_LIBRARIES += timidity
    1.13  endif
    1.14  
    1.15 -LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
    1.16 +LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)
    1.17  
    1.18  include $(BUILD_SHARED_LIBRARY)
     2.1 --- a/external/libvorbisidec-1.2.1.patch	Sun Oct 22 17:32:31 2017 -0700
     2.2 +++ b/external/libvorbisidec-1.2.1.patch	Sun Oct 22 17:29:07 2017 -0700
     2.3 @@ -1,6 +1,6 @@
     2.4  diff -ruN libvorbisidec-1.2.1.orig/Android.mk libvorbisidec-1.2.1/Android.mk
     2.5  --- libvorbisidec-1.2.1.orig/Android.mk	1969-12-31 16:00:00.000000000 -0800
     2.6 -+++ libvorbisidec-1.2.1/Android.mk	2017-10-22 11:49:09.948298409 -0700
     2.7 ++++ libvorbisidec-1.2.1/Android.mk	2017-10-22 17:27:12.176911197 -0700
     2.8  @@ -0,0 +1,32 @@
     2.9  +LOCAL_PATH := $(call my-dir)
    2.10  +
    2.11 @@ -35,7 +35,7 @@
    2.12  +
    2.13  +include $(BUILD_STATIC_LIBRARY)
    2.14  diff -ruN libvorbisidec-1.2.1.orig/misc.h libvorbisidec-1.2.1/misc.h
    2.15 ---- libvorbisidec-1.2.1.orig/misc.h	2017-10-22 11:25:03.341817045 -0700
    2.16 +--- libvorbisidec-1.2.1.orig/misc.h	2017-10-22 17:26:08.725205666 -0700
    2.17  +++ libvorbisidec-1.2.1/misc.h	2017-10-12 20:05:06.719770194 -0700
    2.18  @@ -30,6 +30,7 @@
    2.19   
     3.1 --- a/external/libvorbisidec-1.2.1/Android.mk	Sun Oct 22 17:32:31 2017 -0700
     3.2 +++ b/external/libvorbisidec-1.2.1/Android.mk	Sun Oct 22 17:29:07 2017 -0700
     3.3 @@ -13,19 +13,19 @@
     3.4  endif
     3.5  
     3.6  LOCAL_SRC_FILES += \
     3.7 -    mdct.c \
     3.8 +    mdct.c.arm \
     3.9      block.c \
    3.10 -    window.c \
    3.11 +    window.c.arm \
    3.12      synthesis.c \
    3.13      info.c \
    3.14 -    floor1.c \
    3.15 +    floor1.c.arm \
    3.16      floor0.c.arm \
    3.17      vorbisfile.c.arm \
    3.18      res012.c \
    3.19      mapping0.c \
    3.20      registry.c \
    3.21      codebook.c \
    3.22 -    sharedbook.c \
    3.23 +    sharedbook.c.arm \
    3.24  
    3.25  LOCAL_SHARED_LIBRARIES := ogg
    3.26