auto tools port for ios video

This commit is contained in:
Jehan Monnier 2011-07-13 10:29:59 +02:00
parent 832d66ad98
commit c22169c221
4 changed files with 16 additions and 8 deletions

View file

@ -42,7 +42,7 @@ AM_PROG_CC_STDC
AC_HEADER_STDC
AM_PROG_CC_C_O
case $target_os in
case $target in
*mingw32ce)
CFLAGS="$CFLAGS -D_WIN32_WCE -DORTP_STATIC -D_WIN32_WINNT=0x0501"
CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
@ -58,11 +58,18 @@ case $target_os in
CONSOLE_FLAGS="-mconsole"
mingw_found=yes
;;
*darwin*)
armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin)
CFLAGS="$CFLAGS -DTARGET_OS_IPHONE "
build_tests=no
ios_found=yes
;;
x86_64-apple-darwin*|i686-apple-darwin*)
MSPLUGINS_CFLAGS=""
dnl use macport installation
ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal"
build_macos=yes
;;
;;
esac
AC_SUBST(ACLOCAL_MACOS_FLAGS)
@ -72,6 +79,7 @@ AC_SUBST(GUI_FLAGS)
dnl localization tools
IT_PROG_INTLTOOL([0.40], [no-xml])
AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno)
dnl Initialize libtool
LT_INIT([win32-dll shared disable-static])

View file

@ -49,7 +49,7 @@ liblinphone_la_LIBADD= \
if BUILD_WIN32
liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
endif
if BUILD_TESTS
noinst_PROGRAMS=test_lsd test_ecc
test_lsd_SOURCES=test_lsd.c
@ -60,7 +60,7 @@ test_ecc_SOURCES=test_ecc.c
test_ecc_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
endif
AM_CFLAGS=$(STRICT_OPTIONS) -DIN_LINPHONE \
$(ORTP_CFLAGS) \

View file

@ -33,7 +33,7 @@ clean-local:
rm -rf doc
#tutorials
if BUILD_TESTS
noinst_PROGRAMS=helloworld registration buddy_status chatroom
helloworld_SOURCES=helloworld.c
@ -58,7 +58,7 @@ LINPHONE_TUTOS+=$(chatroom_SOURCES)
chatroom_LDADD=$(helloworld_LDADD)
endif
INCLUDES=-I$(top_srcdir)/coreapi \
$(MEDIASTREAMER_CFLAGS)

@ -1 +1 @@
Subproject commit 213c8169a449f5e559dacd132bace6b508b02e2e
Subproject commit 3d8b6a5f9b974440046430ec1998bab623c07366