From 466c97d06fceb65a5983e1184851b3cfd42402fe Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 3 Jan 2022 00:06:17 +0200 Subject: [PATCH] Fixed OpenAL not linking with SDL2 --- project/jni/openal/Android.mk | 2 +- project/jni/openal/src/Alc/android.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/project/jni/openal/Android.mk b/project/jni/openal/Android.mk index daabfb853..95c29787d 100644 --- a/project/jni/openal/Android.mk +++ b/project/jni/openal/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE := openal APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d)) LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include -LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -DAL_ALEXT_PROTOTYPES +LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -DAL_ALEXT_PROTOTYPES $(if $(filter 1.2, $(SDL_VERSION)), -DAL_SDL_ONPAUSE_CALLBACK) LOCAL_CPP_EXTENSION := .cpp diff --git a/project/jni/openal/src/Alc/android.c b/project/jni/openal/src/Alc/android.c index 448730c8c..4f3a565be 100644 --- a/project/jni/openal/src/Alc/android.c +++ b/project/jni/openal/src/Alc/android.c @@ -30,9 +30,11 @@ typedef void ( * SDL_ANDROID_ApplicationPutToBackgroundCallback_t ) (void); +#ifdef AL_SDL_ONPAUSE_CALLBACK extern int SDL_ANDROID_SetOpenALPutToBackgroundCallback( SDL_ANDROID_ApplicationPutToBackgroundCallback_t PutToBackground, SDL_ANDROID_ApplicationPutToBackgroundCallback_t Restored ); +#endif static int doPause=0; int resumeHandled; @@ -154,7 +156,9 @@ static ALCboolean android_open_playback(ALCdevice *device, const ALCchar *device int channels; int bytes; +#ifdef AL_SDL_ONPAUSE_CALLBACK SDL_ANDROID_SetOpenALPutToBackgroundCallback(al_android_pause_playback, al_android_resume_playback); +#endif if (!cAudioTrack) { /* Cache AudioTrack class and it's method id's