diff --git a/samples/android/fix_properties.bat b/samples/android/fix_properties.bat index 6750c4e8f..134f6ef48 100644 --- a/samples/android/fix_properties.bat +++ b/samples/android/fix_properties.bat @@ -4,5 +4,5 @@ call android update project --target android-11 --library ../../OpenCV-2.4.1/ -- call android update project --target android-11 --name "Tutorial 0 (Basic) - Android Camera" --path ./tutorial-0-androidcamera call android update project --target android-11 --library ../../OpenCV-2.4.1/ --name "Tutorial 1 (Basic) - Add OpenCV" --path ./tutorial-1-addopencv call android update project --target android-11 --library ../../OpenCV-2.4.1/ --name "Tutorial 2 (Basic) - Use OpenCV Camera" --path ./tutorial-2-opencvcamera -call android update project --target android-11 --name "Tutorial 3 (Advanced) - Add Native OpenCV" --path ./tutorial-3-native +call android update project --target android-11 --library ../../OpenCV-2.4.1/ --name "Tutorial 3 (Advanced) - Add Native OpenCV" --path ./tutorial-3-native call android update project --target android-11 --library ../../OpenCV-2.4.1/ --name "Tutorial 4 (Advanced) - Mix Java+Native OpenCV" --path ./tutorial-4-mixed \ No newline at end of file diff --git a/samples/android/fix_properties.sh b/samples/android/fix_properties.sh index ea11ee52a..2d2b88f67 100644 --- a/samples/android/fix_properties.sh +++ b/samples/android/fix_properties.sh @@ -4,7 +4,7 @@ android update project --target android-11 --library ../../OpenCV-2.4.0/ --name android update project --target android-11 --name "Tutorial 0 (Basic) - Android Camera" --path ./tutorial-0-androidcamera android update project --target android-11 --library ../../OpenCV-2.4.0/ --name "Tutorial 1 (Basic) - Add OpenCV" --path ./tutorial-1-addopencv android update project --target android-11 --library ../../OpenCV-2.4.0/ --name "Tutorial 2 (Basic) - Use OpenCV Camera" --path ./tutorial-2-opencvcamera -android update project --target android-11 --name "Tutorial 3 (Advanced) - Add Native OpenCV" --path ./tutorial-3-native +android update project --target android-11 --library ../../OpenCV-2.4.0/ --name "Tutorial 3 (Advanced) - Add Native OpenCV" --path ./tutorial-3-native android update project --target android-11 --library ../../OpenCV-2.4.0/ --name "Tutorial 4 (Advanced) - Mix Java+Native OpenCV" --path ./tutorial-4-mixed exit diff --git a/samples/android/tutorial-3-native/CMakeLists.txt b/samples/android/tutorial-3-native/CMakeLists.txt index 6b790e456..18304a40a 100644 --- a/samples/android/tutorial-3-native/CMakeLists.txt +++ b/samples/android/tutorial-3-native/CMakeLists.txt @@ -1,6 +1,6 @@ set(sample example-tutorial-3-native) -add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 11 ${ANDROID_SDK_TARGET} NATIVE_DEPS opencv_features2d) +add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET} NATIVE_DEPS opencv_features2d) if(TARGET ${sample}) add_dependencies(opencv_android_examples ${sample}) endif()