Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
9d787afe
Commit
9d787afe
authored
May 13, 2011
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small Android build fixes
parent
56cf08a8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CMakeLists.txt
CMakeLists.txt
+3
-3
wincfg.cmd.tmpl
android/scripts/wincfg.cmd.tmpl
+1
-1
No files found.
CMakeLists.txt
View file @
9d787afe
...
...
@@ -479,7 +479,7 @@ if(UNIX)
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"FreeBSD"
OR
${
CMAKE_SYSTEM_NAME
}
MATCHES
"NetBSD"
AND NOT ANDROID
)
set
(
OPENCV_LINKER_LIBS m pthread
)
elseif
(
ANDROID
)
set
(
OPENCV_LINKER_LIBS dl m
)
set
(
OPENCV_LINKER_LIBS dl m
log
)
else
()
set
(
OPENCV_LINKER_LIBS dl m pthread rt
)
endif
()
...
...
@@ -510,10 +510,10 @@ if (ANDROID)
FIND_PACKAGE
(
NativeCamera QUIET
)
if
(
NativeCamera_FOUND
)
set
(
HAVE_ANDROID_NATIVE_CAMERA TRUE
)
set
(
OPENCV_LINKER_LIBS
${
OPENCV_LINKER_LIBS
}
${
NativeCamera_LIBS
}
log
)
set
(
OPENCV_LINKER_LIBS
${
OPENCV_LINKER_LIBS
}
${
NativeCamera_LIBS
}
)
else
()
set
(
HAVE_ANDROID_NATIVE_CAMERA FALSE
)
message
(
"--
Could NOT find NativeCamera for Android"
)
message
(
STATUS
"
Could NOT find NativeCamera for Android"
)
endif
()
endif
()
...
...
android/scripts/wincfg.cmd.tmpl
View file @
9d787afe
...
...
@@ -19,7 +19,7 @@ SET BUILD_DIR=build
::SET BUILD_DIR=build_armeabi
:::: uncomment following lines to compile for ARM-V7 with NEON support
::SET ARM_TARGET=
"armeabi-v7a with NEON"
::SET ARM_TARGET=
armeabi-v7a with NEON
::SET BUILD_DIR=build_neon
:::: other options
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment