generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Android build on Windows.

Browse Source
This commit is contained in:
Andrey Kamaev 2011-11-17 20:43:14 +00:00
parent 9d8d6ba490
commit eb1790e5f1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/android.toolchain.cmake
View File

@ -18,7 +18,7 @@
# For example this one: http://gnuwin32.sourceforge.net/packages/make.htm # For example this one: http://gnuwin32.sourceforge.net/packages/make.htm
# #
# $ SET ANDROID_NDK=C:\<absolute path to NDK>\android-ndk-r7 # $ 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" # $ "%ANDROID_NDK%\prebuilt\windows\bin\make.exe"
# #
# #

4
android/scripts/build.cmd
View File

@ -53,10 +53,10 @@ ECHO ANDROID_ABI=%ANDROID_ABI%
ECHO. ECHO.
IF NOT %BUILD_OPENCV%==1 GOTO other-cmake IF NOT %BUILD_OPENCV%==1 GOTO other-cmake
:opencv-cmake :opencv-cmake
("%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 ("%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
ECHO. & ECHO cmake failed & GOTO end ECHO. & ECHO cmake failed & GOTO end
:other-cmake :other-cmake
("%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 ("%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
ECHO. & ECHO cmake failed & GOTO end ECHO. & ECHO cmake failed & GOTO end
:cmakefin :cmakefin