Skip to content
Permalink
Browse files

Merge branch 'audio-sles'

  • Loading branch information
littleguy77 committed May 9, 2015
2 parents fc94efd + 5daaed1 commit daa6c295fff9bf2ccd3ba123f3b15f77cec9e696
@@ -0,0 +1,42 @@
# Mupen64PlusAE, an N64 emulator for the Android platform
#
# Copyright (C) 2013 Paul Lamb
#
# This file is part of Mupen64PlusAE.
#
# Mupen64PlusAE is free software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# Mupen64PlusAE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with Mupen64PlusAE. If
# not, see <http://www.gnu.org/licenses/>.

# See mupen64plus-ae/jni/Android.mk for build variable definitions
# https://github.com/mupen64plus-ae/mupen64plus-ae/blob/master/jni/Android.mk

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE := mupen64plus-audio-sles
LOCAL_STATIC_LIBRARIES := samplerate

LOCAL_C_INCLUDES := \
$(M64P_API_INCLUDES) \
$(SAMPLERATE_INCLUDES) \

LOCAL_SRC_FILES := \
main.c \
osal_dynamiclib_unix.c \

LOCAL_CFLAGS := \
$(COMMON_CFLAGS) \
-DUSE_SRC \

LOCAL_LDLIBS := -lOpenSLES

include $(BUILD_SHARED_LIBRARY)

2 comments on commit daa6c29

@littleguy77

This comment has been minimized.

Copy link
Member Author

@littleguy77 littleguy77 replied May 9, 2015

@Gillou68310 I merged audio-sles to master, thanks!

@Gillou68310

This comment has been minimized.

Copy link

@Gillou68310 Gillou68310 replied May 11, 2015

Thanks for merging ;-)
Like you said, I thinks it would a good idea to set it as the default plugin in order to have the maximum number of testers.

Please sign in to comment.
You can’t perform that action at this time.