Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
2cc262bc
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2cc262bc
编写于
9月 05, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Android CMake toolchain compiler and linker flags
上级
186f8b74
变更
2
展开全部
隐藏空白更改
内联
并排
Showing
2 changed file
with
165 addition
and
148 deletion
+165
-148
android/android.toolchain.cmake
android/android.toolchain.cmake
+147
-131
modules/androidcamera/camera_wrapper/CMakeLists.txt
modules/androidcamera/camera_wrapper/CMakeLists.txt
+18
-17
未找到文件。
android/android.toolchain.cmake
浏览文件 @
2cc262bc
此差异已折叠。
点击以展开。
modules/androidcamera/camera_wrapper/CMakeLists.txt
浏览文件 @
2cc262bc
...
...
@@ -6,24 +6,25 @@ link_directories("${ANDROID_SOURCE_TREE}/out/target/product/generic/system/lib")
if
(
ANDROID_VERSION VERSION_LESS
"4.1"
)
INCLUDE_DIRECTORIES
(
BEFORE
${
ANDROID_SOURCE_TREE
}
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include/ui
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include/surfaceflinger
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include/camera
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include/media
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include
${
ANDROID_SOURCE_TREE
}
/system/core/include
${
ANDROID_SOURCE_TREE
}
/hardware/libhardware/include
${
ANDROID_SOURCE_TREE
}
/frameworks/base/native/include
)
${
ANDROID_SOURCE_TREE
}
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include/ui
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include/surfaceflinger
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include/camera
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include/media
${
ANDROID_SOURCE_TREE
}
/frameworks/base/include
${
ANDROID_SOURCE_TREE
}
/system/core/include
${
ANDROID_SOURCE_TREE
}
/hardware/libhardware/include
${
ANDROID_SOURCE_TREE
}
/frameworks/base/native/include
${
ANDROID_SOURCE_TREE
}
/frameworks/base/opengl/include
)
else
()
INCLUDE_DIRECTORIES
(
BEFORE
${
ANDROID_SOURCE_TREE
}
${
ANDROID_SOURCE_TREE
}
/frameworks/native/include
${
ANDROID_SOURCE_TREE
}
/frameworks/av/include
${
ANDROID_SOURCE_TREE
}
/system/core/include
${
ANDROID_SOURCE_TREE
}
/hardware/libhardware/include
)
${
ANDROID_SOURCE_TREE
}
${
ANDROID_SOURCE_TREE
}
/frameworks/native/include
${
ANDROID_SOURCE_TREE
}
/frameworks/av/include
${
ANDROID_SOURCE_TREE
}
/system/core/include
${
ANDROID_SOURCE_TREE
}
/hardware/libhardware/include
)
endif
()
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE
)
...
...
@@ -33,8 +34,8 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
SET
(
CMAKE_C_FLAGS_RELEASE
""
)
SET
(
CMAKE_CXX_FLAGS_RELEASE
""
)
string
(
REPLACE
"-O3"
""
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
"
)
string
(
REPLACE
"-O3"
""
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
"
)
string
(
REPLACE
"-frtti"
"-fno-rtti"
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
"
)
# because Android libraries are built without rtti
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Os -fno-strict-aliasing -finline-limit=64 -fuse-cxa-atexit"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Os -fno-strict-aliasing -finline-limit=64 -fuse-cxa-atexit"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录