Changeset 848:d0af39877423 in mediastreamer2

Timestamp:

Sep 25, 2009 10:34:38 PM (4 years ago)

Author:

Jehan Monnier <jehan.monnier@…>

Branch:

default

committer:

jehan <jehanmonnier@mac-mini-de-jehan-monnier.local> 1263820272 -3600

Message:

prepare iphone sdk compilation

Location:

linphone

Files:

• Makefile.am (modified) (1 diff)
• configure.in (modified) (1 diff)
• mediastreamer2/configure.ac (modified) (1 diff)
• mediastreamer2/src/aqsnd.c (modified) (1 diff)
• po/Makefile.in.in (modified) (1 diff)

linphone/Makefile.am

@@ -147 +147 @@
           -e 's/\@LINPHONE_MD5\@/$(shell md5sum linphone-$(VERSION).tar.gz | awk {'print $$1'})/' < $< > $@
 
-

linphone/configure.in

@@ -423 +423 @@
 AC_PATH_PROG(DOXYGEN,doxygen,false)
 AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false)
-
 
 AC_OUTPUT([ 

linphone/mediastreamer2/configure.ac

@@ -135 +135 @@
                 MSPLUGINS_LIBS="-dynamiclib"
                 macosx_found=yes
-                LIBS="$LIBS -framework CoreFoundation -framework Cocoa"
+                LIBS="$LIBS -framework CoreFoundation -framework AudioToolbox -framework CoreAudio"
         ;;
         *mingw32ce)

linphone/mediastreamer2/src/aqsnd.c

@@ -54 +54 @@
 
 #include <AudioToolbox/AudioToolbox.h>
-#if !defined(__AudioHardware_h__)
+#if (!defined(__AudioHardware_h__) & !defined(__IPHONE_3_0))
 #include "AudioHardware.h"
 #endif

linphone/po/Makefile.in.in

@@ -57 +57 @@
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)