Commit e111ed5e authored by Ghislain MARY's avatar Ghislain MARY

Build vpx statically and in the source tree on Mac OS X.

parent ab2cb03d
...@@ -36,15 +36,17 @@ set(EP_vpx_CONFIGURE_OPTIONS ...@@ -36,15 +36,17 @@ set(EP_vpx_CONFIGURE_OPTIONS
"--disable-examples" "--disable-examples"
"--disable-unit-tests" "--disable-unit-tests"
) )
set(EP_vpx_LINKING_TYPE "--disable-static" "--enable-shared")
if(WIN32) if(WIN32)
set(EP_vpx_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/vpx/enable-shared-on-windows.patch") set(EP_vpx_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/vpx/enable-shared-on-windows.patch")
endif(WIN32) endif(WIN32)
if(APPLE) if(APPLE)
set(EP_vpx_TARGET "x86-darwin10-gcc") set(EP_vpx_TARGET "x86-darwin10-gcc")
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared")
set(EP_vpx_BUILD_IN_SOURCE "yes")
else(APPLE) else(APPLE)
set(EP_vpx_TARGET "generic-gnu") set(EP_vpx_TARGET "generic-gnu")
set(EP_vpx_LINKING_TYPE "--disable-static" "--enable-shared")
endif(APPLE) endif(APPLE)
set(EP_vpx_CROSS_COMPILATION_OPTIONS set(EP_vpx_CROSS_COMPILATION_OPTIONS
......
...@@ -195,13 +195,12 @@ endmacro(linphone_builder_apply_extra_flags) ...@@ -195,13 +195,12 @@ endmacro(linphone_builder_apply_extra_flags)
macro(linphone_builder_set_ep_directories PROJNAME) macro(linphone_builder_set_ep_directories PROJNAME)
set(ep_source "${ep_base}/Source/EP_${PROJNAME}") set(ep_source "${ep_base}/Source/EP_${PROJNAME}")
if(NOT "${LINPHONE_BUILDER_TOOLCHAIN}" STREQUAL "")
set(ep_tmp "${ep_base}/tmp-${LINPHONE_BUILDER_TOOLCHAIN}/${PROJNAME}") set(ep_tmp "${ep_base}/tmp-${LINPHONE_BUILDER_TOOLCHAIN}/${PROJNAME}")
if("${EP_${PROJNAME}_BUILD_IN_SOURCE}" STREQUAL "yes")
set(ep_build "${ep_source}")
else("${EP_${PROJNAME}_BUILD_IN_SOURCE}" STREQUAL "yes")
set(ep_build "${ep_base}/Build-${LINPHONE_BUILDER_TOOLCHAIN}/${PROJNAME}") set(ep_build "${ep_base}/Build-${LINPHONE_BUILDER_TOOLCHAIN}/${PROJNAME}")
else() endif("${EP_${PROJNAME}_BUILD_IN_SOURCE}" STREQUAL "yes")
set(ep_tmp "${ep_base}/tmp/${PROJNAME}")
set(ep_build "${ep_base}/Build/${PROJNAME}")
endif()
endmacro(linphone_builder_set_ep_directories) endmacro(linphone_builder_set_ep_directories)
......
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