Commit 135daa1a authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Define some more external source paths to build from git submodules for IOS.

parent 07e5e5fd
...@@ -39,6 +39,7 @@ else() ...@@ -39,6 +39,7 @@ else()
set(EP_ffmpeg_URL "http://ffmpeg.org/releases/ffmpeg-0.10.2.tar.gz") set(EP_ffmpeg_URL "http://ffmpeg.org/releases/ffmpeg-0.10.2.tar.gz")
set(EP_ffmpeg_URL_HASH "MD5=f449c9fb925e80c457e82187e6c20910") set(EP_ffmpeg_URL_HASH "MD5=f449c9fb925e80c457e82187e6c20910")
set(EP_ffmpeg_EXTERNAL_SOURCE_PATHS "externals/ffmpeg")
set(EP_ffmpeg_BUILD_METHOD "autotools") set(EP_ffmpeg_BUILD_METHOD "autotools")
set(EP_ffmpeg_CONFIGURE_OPTIONS set(EP_ffmpeg_CONFIGURE_OPTIONS
"--disable-zlib" "--disable-zlib"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
set(EP_ms2_GIT_REPOSITORY "git://git.linphone.org/mediastreamer2.git") set(EP_ms2_GIT_REPOSITORY "git://git.linphone.org/mediastreamer2.git")
set(EP_ms2_GIT_TAG_LATEST "master") set(EP_ms2_GIT_TAG_LATEST "master")
set(EP_ms2_GIT_TAG "2.11.2") set(EP_ms2_GIT_TAG "2.11.2")
set(EP_ms2_EXTERNAL_SOURCE_PATHS "ms2" "mediastreamer2" "linphone/mediastreamer2") set(EP_ms2_EXTERNAL_SOURCE_PATHS "mediastreamer2" "linphone/mediastreamer2")
set(EP_ms2_CMAKE_OPTIONS ) set(EP_ms2_CMAKE_OPTIONS )
set(EP_ms2_LINKING_TYPE "-DENABLE_STATIC=NO") set(EP_ms2_LINKING_TYPE "-DENABLE_STATIC=NO")
......
...@@ -34,6 +34,8 @@ endif() ...@@ -34,6 +34,8 @@ endif()
set(EP_openh264_GIT_REPOSITORY "https://github.com/cisco/openh264") set(EP_openh264_GIT_REPOSITORY "https://github.com/cisco/openh264")
set(EP_openh264_GIT_TAG "v1.4.0") set(EP_openh264_GIT_TAG "v1.4.0")
set(EP_openh264_EXTERNAL_SOURCE_PATHS "externals/openh264")
set(EP_openh264_BUILD_METHOD "custom") set(EP_openh264_BUILD_METHOD "custom")
set(EP_openh264_BUILD_IN_SOURCE "yes") set(EP_openh264_BUILD_IN_SOURCE "yes")
set(EP_openh264_LINKING_TYPE "-static") set(EP_openh264_LINKING_TYPE "-static")
......
...@@ -35,6 +35,7 @@ if(EP_vpx_PREBUILT) ...@@ -35,6 +35,7 @@ if(EP_vpx_PREBUILT)
else() else()
set(EP_vpx_URL "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2") set(EP_vpx_URL "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2")
set(EP_vpx_URL_HASH "MD5=14783a148872f2d08629ff7c694eb31f") set(EP_vpx_URL_HASH "MD5=14783a148872f2d08629ff7c694eb31f")
set(EP_vpx_EXTERNAL_SOURCE_PATHS "externals/libvpx")
set(EP_vpx_BUILD_METHOD "autotools") set(EP_vpx_BUILD_METHOD "autotools")
set(EP_vpx_CONFIG_H_FILE vpx_config.h) set(EP_vpx_CONFIG_H_FILE vpx_config.h)
set(EP_vpx_CONFIGURE_OPTIONS set(EP_vpx_CONFIGURE_OPTIONS
......
...@@ -655,7 +655,7 @@ function(linphone_builder_add_project PROJNAME) ...@@ -655,7 +655,7 @@ function(linphone_builder_add_project PROJNAME)
if(LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH) if(LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH)
foreach(SUBDIR ${EP_${PROJNAME}_EXTERNAL_SOURCE_PATHS}) foreach(SUBDIR ${EP_${PROJNAME}_EXTERNAL_SOURCE_PATHS})
if(NOT EP_${PROJNAME}_SOURCE_DIR) if(NOT EP_${PROJNAME}_SOURCE_DIR)
if(EXISTS "${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}/CMakeLists.txt") if(EXISTS "${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}")
set(EP_${PROJNAME}_SOURCE_DIR "${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}") set(EP_${PROJNAME}_SOURCE_DIR "${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}")
endif() endif()
endif() endif()
......
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