libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-03-03 16:57:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved some of Android's specific stuff into its own section.

Browse Source
This commit is contained in:
Jean-Philip Desjardins 2017-05-28 16:24:26 -04:00
parent 1c39ed6ba7
commit 69a68683c4
6 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/ui_android/java/com/virtualapplications/play/InputManager.java
View File

@ -4,7 +4,7 @@ public class InputManager
{
static
{
System.loadLibrary("PlayCore");
System.loadLibrary("Play");
}
public static native void setButtonState(int button, boolean pressed);

2
Source/ui_android/java/com/virtualapplications/play/NativeInterop.java
View File

@ -7,7 +7,7 @@ public class NativeInterop
{
static
{
System.loadLibrary("PlayCore");
System.loadLibrary("Play");
}
public static native void setFilesDirPath(String dirPath);

2
Source/ui_android/java/com/virtualapplications/play/SettingsManager.java
View File

@ -4,7 +4,7 @@ public class SettingsManager
{
static
{
System.loadLibrary("PlayCore");
System.loadLibrary("Play");
}
public static native void save();

2
Source/ui_android/java/com/virtualapplications/play/StatsManager.java
View File

@ -4,7 +4,7 @@ public class StatsManager
{
static
{
System.loadLibrary("PlayCore");
System.loadLibrary("Play");
}
public static native int getFrames();

2
build_android/build.gradle
View File

@ -48,7 +48,7 @@ android {
arguments "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang",
"-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_STL=c++_static"
cppFlags "-frtti"
targets "PlayCore"
targets "Play"
}
ndk {
abiFilters 'armeabi-v7a', 'x86', 'x86_64', 'arm64-v8a'

39
build_cmake/CMakeLists.txt
View File

@ -559,29 +559,14 @@ if(TARGET_PLATFORM_MACOS OR TARGET_PLATFORM_UNIX)
set(PLATFORM_SPECIFIC_SRC_FILES ../Source/Posix_VolumeStream.cpp)
endif()
if(ANDROID)
set(PLATFORM_SPECIFIC_SRC_FILES
../Source/ui_android/GSH_OpenGLAndroid.cpp
../Source/ui_android/InputManager.cpp
../Source/ui_android/NativeInterop.cpp
../Source/ui_android/NativeShared.cpp
../Source/ui_android/SettingsManager.cpp
../Source/ui_android/SH_OpenSL.cpp
../Source/ui_android/StatsManager.cpp
)
endif()
if(OPENAL_FOUND)
list(APPEND PLATFORM_SPECIFIC_SRC_FILES
../tools/PsfPlayer/Source/SH_OpenAL.cpp
)
endif()
if(ANDROID)
add_library(PlayCore SHARED ${COMMON_SRC_FILES} ${PLATFORM_SPECIFIC_SRC_FILES})
else()
add_library(PlayCore STATIC ${COMMON_SRC_FILES} ${PLATFORM_SPECIFIC_SRC_FILES})
endif()
add_library(PlayCore STATIC ${COMMON_SRC_FILES} ${PLATFORM_SPECIFIC_SRC_FILES})
target_link_libraries(PlayCore Boost::boost)
if(NOT ANDROID)
if(THREADS_HAVE_PTHREAD_ARG)
@ -589,8 +574,7 @@ if(NOT ANDROID)
endif()
endif()
target_link_libraries(PlayCore ${PROJECT_LIBS})
list(APPEND PROJECT_LIBS PlayCore)
list(INSERT PROJECT_LIBS 0 PlayCore)
if(TARGET_PLATFORM_UNIX)
include_directories(
@ -860,6 +844,23 @@ if(TARGET_PLATFORM_IOS)
endif(TARGET_PLATFORM_IOS)
if(TARGET_PLATFORM_ANDROID)
set(ANDROID_SRC_FILES
../Source/ui_android/GSH_OpenGLAndroid.cpp
../Source/ui_android/InputManager.cpp
../Source/ui_android/NativeInterop.cpp
../Source/ui_android/NativeShared.cpp
../Source/ui_android/SettingsManager.cpp
../Source/ui_android/SH_OpenSL.cpp
../Source/ui_android/StatsManager.cpp
)
add_library(Play SHARED ${ANDROID_SRC_FILES})
target_link_libraries(Play ${PROJECT_LIBS})
endif(TARGET_PLATFORM_ANDROID)
if(TARGET_PLATFORM_WIN32)
ENABLE_LANGUAGE(ASM_MASM)