Commit 8957f80b authored by Ghislain MARY's avatar Ghislain MARY

Enable position independent code for Android.

parent 281ba15b
...@@ -125,6 +125,7 @@ else() ...@@ -125,6 +125,7 @@ else()
set(EP_vpx_EXTRA_LDFLAGS "--sysroot=${CMAKE_SYSROOT}") set(EP_vpx_EXTRA_LDFLAGS "--sysroot=${CMAKE_SYSROOT}")
list(APPEND EP_vpx_CONFIGURE_OPTIONS list(APPEND EP_vpx_CONFIGURE_OPTIONS
"--sdk-path=${ANDROID_NDK_PATH}" "--sdk-path=${ANDROID_NDK_PATH}"
"--enable-pic"
) )
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic") set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")
elseif(QNX) elseif(QNX)
......
...@@ -101,6 +101,7 @@ list(APPEND LINPHONE_BUILDER_EP_VARS ...@@ -101,6 +101,7 @@ list(APPEND LINPHONE_BUILDER_EP_VARS
CMAKE_MODULE_LINKER_FLAGS:STRING CMAKE_MODULE_LINKER_FLAGS:STRING
CMAKE_MODULE_PATH:PATH CMAKE_MODULE_PATH:PATH
CMAKE_NO_BUILD_TYPE:BOOL CMAKE_NO_BUILD_TYPE:BOOL
CMAKE_POSITION_INDEPENDENT_CODE:BOOL
CMAKE_PREFIX_PATH:STRING CMAKE_PREFIX_PATH:STRING
CMAKE_PROGRAM_PATH:STRING CMAKE_PROGRAM_PATH:STRING
CMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH CMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH
......
...@@ -46,6 +46,7 @@ set(DEFAULT_VALUE_CMAKE_PLUGIN_LINKING_TYPE "-DENABLE_STATIC=NO" "-DENABLE_SHARE ...@@ -46,6 +46,7 @@ set(DEFAULT_VALUE_CMAKE_PLUGIN_LINKING_TYPE "-DENABLE_STATIC=NO" "-DENABLE_SHARE
# Global configuration # Global configuration
set(LINPHONE_BUILDER_HOST "${CMAKE_SYSTEM_PROCESSOR}-linux-android") set(LINPHONE_BUILDER_HOST "${CMAKE_SYSTEM_PROCESSOR}-linux-android")
set(CMAKE_POSITION_INDEPENDENT_CODE YES)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armeabi" AND ENABLE_VIDEO) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armeabi" AND ENABLE_VIDEO)
message(STATUS "Disabling video for armv6") message(STATUS "Disabling video for armv6")
set(ENABLE_VIDEO NO CACHE BOOL "") set(ENABLE_VIDEO NO CACHE BOOL "")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment