Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-cmake-builder
Commits
777529e7
Commit
777529e7
authored
May 06, 2016
by
Ghislain MARY
Browse files
Fix Android build with AMRWB, OpenH264 and vcard when using NDK 11.
parent
a4963f27
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
builders/voamrwbenc/CMakeLists.txt
builders/voamrwbenc/CMakeLists.txt
+5
-1
toolchains/android/toolchain-android.cmake
toolchains/android/toolchain-android.cmake
+3
-0
No files found.
builders/voamrwbenc/CMakeLists.txt
View file @
777529e7
...
...
@@ -122,7 +122,11 @@ if(ENABLE_ARMV5E OR ENABLE_ARMV7NEON)
endif
()
get_directory_property
(
DIRECTORY_PROPERTY_COMPILE_OPTIONS
"COMPILE_OPTIONS"
)
string
(
REPLACE
";"
" "
DIRECTORY_PROPERTY_COMPILE_OPTIONS
"
${
DIRECTORY_PROPERTY_COMPILE_OPTIONS
}
"
)
set
(
CMAKE_ASM_COMPILE_OBJECT
"<CMAKE_ASM_COMPILER>
${
CMAKE_CPP_FLAGS
}
${
CMAKE_C_FLAGS
}
${
DIRECTORY_PROPERTY_COMPILE_OPTIONS
}
${
ARCH_OPTIONS
}
-o <OBJECT> -c <SOURCE>"
)
set
(
CMAKE_ASM_TARGET_FLAG
""
)
if
(
CMAKE_C_COMPILER_TARGET
)
set
(
CMAKE_ASM_TARGET_FLAG
"--target=
${
CMAKE_C_COMPILER_TARGET
}
"
)
endif
()
set
(
CMAKE_ASM_COMPILE_OBJECT
"<CMAKE_ASM_COMPILER>
${
CMAKE_ASM_TARGET_FLAG
}
${
CMAKE_CPP_FLAGS
}
${
CMAKE_C_FLAGS
}
${
DIRECTORY_PROPERTY_COMPILE_OPTIONS
}
${
ARCH_OPTIONS
}
-o <OBJECT> -c <SOURCE>"
)
enable_language
(
ASM
)
endif
()
...
...
toolchains/android/toolchain-android.cmake
View file @
777529e7
...
...
@@ -101,6 +101,8 @@ if(CLANG_EXECUTABLE)
set
(
CMAKE_CXX_COMPILER_TARGET
"
${
CLANG_TARGET
}
"
)
set
(
CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN
"
${
EXTERNAL_TOOLCHAIN_PATH
}
/.."
)
set
(
ANDROID_TOOLCHAIN_PREFIX
"
${
EXTERNAL_TOOLCHAIN_PATH
}
/
${
COMPILER_PREFIX
}
-"
)
else
()
set
(
GCC_VERSION
"4.8"
)
...
...
@@ -168,3 +170,4 @@ if(GCC_LIBRARY_PATH)
endif
()
link_libraries
(
"
${
ANDROID_NDK_PATH
}
/sources/cxx-stl/gnu-libstdc++/
${
GCC_VERSION
}
/libs/
${
CMAKE_SYSTEM_PROCESSOR
}
/libgnustl_static.a"
)
link_libraries
(
"log"
)
link_libraries
(
"atomic"
)
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