projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9d8d6ba)
Fixed Android build on Windows.
authorAndrey Kamaev <no@email>
Thu, 17 Nov 2011 20:43:14 +0000 (20:43 +0000)
committerAndrey Kamaev <no@email>
Thu, 17 Nov 2011 20:43:14 +0000 (20:43 +0000)
android/android.toolchain.cmake patch | blob | history
android/scripts/build.cmd patch | blob | history

diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake
index dbdf3d1..2800ccf 100644 (file)
--- a/android/android.toolchain.cmake
+++ b/android/android.toolchain.cmake
@@ -18,7 +18,7 @@
 #     For example this one: http://gnuwin32.sourceforge.net/packages/make.htm
 #
 #   $ SET ANDROID_NDK=C:\<absolute path to NDK>\android-ndk-r7
-#   $ cmake.exe -G"MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=<path to this file>\android.toolchain.cmake -DCMAKE_BUILD_TOOL="%ANDROID_NDK%\prebuilt\windows\bin\make.exe" ..
+#   $ cmake.exe -G"MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=<path to this file>\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM="%ANDROID_NDK%\prebuilt\windows\bin\make.exe" ..
 #   $ "%ANDROID_NDK%\prebuilt\windows\bin\make.exe"
 #
 #
diff --git a/android/scripts/build.cmd b/android/scripts/build.cmd
index 6c40166..0e98276 100644 (file)
--- a/android/scripts/build.cmd
+++ b/android/scripts/build.cmd
@@ -53,10 +53,10 @@ ECHO ANDROID_ABI=%ANDROID_ABI%
 ECHO.\r
 IF NOT %BUILD_OPENCV%==1 GOTO other-cmake\r
 :opencv-cmake\r
-("%CMAKE_EXE%" -G"MinGW Makefiles" -DANDROID_ABI="%ANDROID_ABI%" -C "%SOURCE_DIR%\CMakeCache.android.initial.cmake" -DCMAKE_TOOLCHAIN_FILE="%SOURCE_DIR%"\android.toolchain.cmake -DCMAKE_BUILD_TOOL="%MAKE_EXE%" %* "%SOURCE_DIR%\..") && GOTO cmakefin\r
+("%CMAKE_EXE%" -G"MinGW Makefiles" -DANDROID_ABI="%ANDROID_ABI%" -C "%SOURCE_DIR%\CMakeCache.android.initial.cmake" -DCMAKE_TOOLCHAIN_FILE="%SOURCE_DIR%"\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM="%MAKE_EXE%" %* "%SOURCE_DIR%\..") && GOTO cmakefin\r
 ECHO. & ECHO cmake failed &    GOTO end\r
 :other-cmake\r
-("%CMAKE_EXE%" -G"MinGW Makefiles" -DANDROID_ABI="%ANDROID_ABI%" -DOpenCV_DIR="%OPENCV_BUILD_DIR%" -DCMAKE_TOOLCHAIN_FILE="%OPENCV_BUILD_DIR%\..\android.toolchain.cmake" -DCMAKE_BUILD_TOOL="%MAKE_EXE%" %* "%SOURCE_DIR%") && GOTO cmakefin\r
+("%CMAKE_EXE%" -G"MinGW Makefiles" -DANDROID_ABI="%ANDROID_ABI%" -DOpenCV_DIR="%OPENCV_BUILD_DIR%" -DCMAKE_TOOLCHAIN_FILE="%OPENCV_BUILD_DIR%\..\android.toolchain.cmake" -DCMAKE_MAKE_PROGRAM="%MAKE_EXE%" %* "%SOURCE_DIR%") && GOTO cmakefin\r
 ECHO. & ECHO cmake failed &    GOTO end\r
 :cmakefin\r
 \r
Domain: Multimedia / Media Vision;