From a5dca8b446fb8243ab901b88dd953dfa722a6361 Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Tue, 1 Oct 2013 23:21:35 +0200 Subject: [PATCH 1/5] opensles detection: fail required but not found --- cmake/FindOpenSLES.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/FindOpenSLES.cmake b/cmake/FindOpenSLES.cmake index d11a64324..dec8956a4 100644 --- a/cmake/FindOpenSLES.cmake +++ b/cmake/FindOpenSLES.cmake @@ -28,7 +28,10 @@ find_package_handle_standard_args(OPENSLES DEFAULT_MSG if(OPENSLES_FOUND) set(OPENSLES_LIBRARIES ${OPENSLES_LIBRARY}) else(OPENSLES_FOUND) - set(OPENSLES_LIBRARIES) + message("${OPENSLES_FIND_REQUIRED}") + if (OpenSLES_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find OPENSLES") + endif() endif(OPENSLES_FOUND) mark_as_advanced(OPENSLES_INCLUDE_DIR OPENSLES_LIBRARY) From 6d060d2fcc66e660a6a6beced444460048c99dbf Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Tue, 1 Oct 2013 23:22:45 +0200 Subject: [PATCH 2/5] android build: don't set WITH_OPENSLES in options WITH_OPENSLES is automatically set by find_feature --- cmake/ConfigOptionsAndroid.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/ConfigOptionsAndroid.cmake b/cmake/ConfigOptionsAndroid.cmake index 4ffec393d..28aa01f4a 100644 --- a/cmake/ConfigOptionsAndroid.cmake +++ b/cmake/ConfigOptionsAndroid.cmake @@ -21,11 +21,10 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") endif() option(WITH_DEBUG_ANDROID_JNI "Enable debug output for android jni bindings" ${DEFAULT_DEBUG_OPTION}) -option(WITH_OPENSLES "Enable sound and microphone redirection using OpenSLES" ON) option(ANDROID_BUILD_JAVA "Automatically android java code - build type depends on CMAKE_BUILD_TYPE" ON) option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT}) set(ANDROID_APP_TARGET_SDK 11 CACHE STRING "Application target android SDK") set(ANDROID_APP_MIN_SDK 9 CACHE STRING "Application minimum android SDK requirement") set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK") - +set(ANDROID_NATIVE_API_LEVEL "9" CACHE STRING "Android API level for native code") From 4c3ceb6093ab1c5db2eb19659ce44b3c7a404f49 Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Tue, 1 Oct 2013 23:30:58 +0200 Subject: [PATCH 3/5] android build: set default ndk api level to 9 API level 9 is required in order build the android client with audio support. --- cmake/AndroidToolchain.cmake | 2 +- docs/README.android | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/AndroidToolchain.cmake b/cmake/AndroidToolchain.cmake index 9eeb7beaf..f98385764 100644 --- a/cmake/AndroidToolchain.cmake +++ b/cmake/AndroidToolchain.cmake @@ -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 ) diff --git a/docs/README.android b/docs/README.android index 08920db5b..f7c2b7e33 100644 --- a/docs/README.android +++ b/docs/README.android @@ -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) From 257a1cb8ccd8064bba82a0501a7e4b17821db55e Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Wed, 2 Oct 2013 10:23:06 +0200 Subject: [PATCH 4/5] FindOpenSLES: removed debug message --- cmake/FindOpenSLES.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/FindOpenSLES.cmake b/cmake/FindOpenSLES.cmake index dec8956a4..79af5ea21 100644 --- a/cmake/FindOpenSLES.cmake +++ b/cmake/FindOpenSLES.cmake @@ -28,7 +28,6 @@ find_package_handle_standard_args(OPENSLES DEFAULT_MSG if(OPENSLES_FOUND) set(OPENSLES_LIBRARIES ${OPENSLES_LIBRARY}) else(OPENSLES_FOUND) - message("${OPENSLES_FIND_REQUIRED}") if (OpenSLES_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find OPENSLES") endif() From 199909e8f11c48a9d04368a4e129712d7b518c51 Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Wed, 2 Oct 2013 10:24:07 +0200 Subject: [PATCH 5/5] andriod: removed unecessary config option --- cmake/ConfigOptionsAndroid.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/ConfigOptionsAndroid.cmake b/cmake/ConfigOptionsAndroid.cmake index 28aa01f4a..f024162fb 100644 --- a/cmake/ConfigOptionsAndroid.cmake +++ b/cmake/ConfigOptionsAndroid.cmake @@ -27,4 +27,3 @@ option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DE set(ANDROID_APP_TARGET_SDK 11 CACHE STRING "Application target android SDK") set(ANDROID_APP_MIN_SDK 9 CACHE STRING "Application minimum android SDK requirement") set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK") -set(ANDROID_NATIVE_API_LEVEL "9" CACHE STRING "Android API level for native code")