mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_debug_settings 

Conflicts:
	cmake/ConfigOptionsAndroid.cmake
This commit is contained in:
Armin Novak 2013-10-02 17:43:14 +02:00
parent 38323a4568 3db1b51ba1
commit f4b68b2d02
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/AndroidToolchain.cmake
View File

@ -344,7 +344,7 @@ set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armea
set( ANDROID_SUPPORTED_ABIS_x86 "x86" )
set( ANDROID_SUPPORTED_ABIS_mipsel "mips" )
set( ANDROID_DEFAULT_NDK_API_LEVEL 8 )
set( ANDROID_DEFAULT_NDK_API_LEVEL 9 )
set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 )
set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 )

4
cmake/FindOpenSLES.cmake
View File

@ -28,7 +28,9 @@ find_package_handle_standard_args(OPENSLES DEFAULT_MSG
if(OPENSLES_FOUND)
set(OPENSLES_LIBRARIES ${OPENSLES_LIBRARY})
else(OPENSLES_FOUND)
set(OPENSLES_LIBRARIES)
if (OpenSLES_FIND_REQUIRED)
message(FATAL_ERROR "Could NOT find OPENSLES")
endif()
endif(OPENSLES_FOUND)
mark_as_advanced(OPENSLES_INCLUDE_DIR OPENSLES_LIBRARY)

2
docs/README.android
View File

@ -18,7 +18,7 @@ Build requirements
For the Android port some additional dependencies need to be fulfilled:
* for JNI
- Android NDK (>= r8d)
- Android NDK (>= r9)
- prebuild static openssl libraries (see below)
* for the Java GUI (if build with ant)