mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-02 02:16:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add CUNIT repo to linphone-iphone, to enable unit tests to compile

Browse source 
+ update belle-sip and linphone to get fixes for this compilation to proceed
+ make the SDK build correctly with these tests
This commit is contained in:
Guillaume BIENKOWSKI 2014-02-28 10:36:38 +01:00
parent 7a15a45e1f
commit 4e6abdf82a
6 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -61,3 +61,6 @@
[submodule "submodules/msisac"] [submodule "submodules/msisac"]
path = submodules/msisac path = submodules/msisac
url = git://git.linphone.org/msisac url = git://git.linphone.org/msisac
[submodule "submodules/cunit"]
path = submodules/cunit
url = git://git.linphone.org/cunit.git

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit c068cfc7e671d3ec3291553fc40ac63ee749f94b Subproject commit 76bfd35c085707db61e0e917f25b4142ffa9f89d

3
submodules/build/builder-iphone-os.mk
View file

@ -34,7 +34,6 @@ linphone_configure_controls= \
--disable-x11 \ --disable-x11 \
--enable-bellesip \ --enable-bellesip \
--with-gsm=$(prefix) \ --with-gsm=$(prefix) \
--disable-tests \
--disable-tutorials \ --disable-tutorials \
--disable-tools \ --disable-tools \
--with-srtp=$(prefix) \ --with-srtp=$(prefix) \
@ -135,7 +134,7 @@ veryclean: veryclean-linphone veryclean-msbcg729
# list of the submodules to build # list of the submodules to build
MS_MODULES := msilbc libilbc msamr mssilk msx264 msisac MS_MODULES := msilbc libilbc msamr mssilk msx264 msisac
SUBMODULES_LIST := polarssl libantlr belle-sip srtp zrtpcpp speex libgsm libvpx libxml2 ffmpeg opus SUBMODULES_LIST := polarssl libantlr cunit belle-sip srtp zrtpcpp speex libgsm libvpx libxml2 ffmpeg opus
.NOTPARALLEL build-linphone: init $(addprefix build-,$(SUBMODULES_LIST)) mode_switch_check $(LINPHONE_BUILD_DIR)/Makefile .NOTPARALLEL build-linphone: init $(addprefix build-,$(SUBMODULES_LIST)) mode_switch_check $(LINPHONE_BUILD_DIR)/Makefile
cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install

4
submodules/build/iphone-config.site
View file

@ -3,11 +3,13 @@
SDK_VERSION_MAJOR=4 SDK_VERSION_MAJOR=4
SDK_VERSION=4.0 SDK_VERSION=4.0
MCPU="" MCPU=""
CLANG_TARGET_SPECIFIER=miphoneos-version-min
if test "${host_alias}" = "i386-apple-darwin" ; then if test "${host_alias}" = "i386-apple-darwin" ; then
PLATFORM=Simulator PLATFORM=Simulator
ARCH=i386 ARCH=i386
CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=i386" CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=i386"
MCPU="" MCPU=""
CLANG_TARGET_SPECIFIER=mios-simulator-version-min
elif test "${host_alias}" = "armv6-apple-darwin" ; then elif test "${host_alias}" = "armv6-apple-darwin" ; then
ARCH=armv6 ARCH=armv6
PLATFORM=OS PLATFORM=OS
@ -40,7 +42,7 @@ fi
for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ;
echo "Selecting SDK path = ${SYSROOT_PATH}" echo "Selecting SDK path = ${SYSROOT_PATH}"
COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions" COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -${CLANG_TARGET_SPECIFIER}=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions"
CC="xcrun clang -std=c99 $COMMON_FLAGS" CC="xcrun clang -std=c99 $COMMON_FLAGS"
OBJC="xcrun clang -std=c99 $COMMON_FLAGS" OBJC="xcrun clang -std=c99 $COMMON_FLAGS"
CXX="xcrun clang++ $COMMON_FLAGS" CXX="xcrun clang++ $COMMON_FLAGS"

1
submodules/cunit Submodule

@ -0,0 +1 @@
Subproject commit 86562ef04d0d66c007d7822944a75f540ae37f19

2
submodules/linphone

@ -1 +1 @@
Subproject commit ca5f624bc6480e1a4b35ed0520db18c7fd21bd49 Subproject commit 9915ab662dd58b4dc736eca90f89466ded059058