Commit 3995caba authored by smorlat's avatar smorlat

debug mediastreamer2 compilation under macosx 10.5

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@610 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 3d7751ef
......@@ -10,10 +10,20 @@ else
AUTOMAKE=automake-${AM_VERSION}
fi
if test -f /opt/local/bin/glibtoolize ; then
# darwin
LIBTOOLIZE=/opt/local/bin/glibtoolize
else
LIBTOOLIZE=libtoolize
fi
if test -d /opt/local/share/aclocal ; then
ACLOCAL_ARGS="-I /opt/local/share/aclocal"
fi
echo "Generating build scripts in mediastreamer..."
set -x
libtoolize --copy --force
$LIBTOOLIZE --copy --force
autoheader
$ACLOCAL
$ACLOCAL $ACLOCAL_ARGS
$AUTOMAKE --force-missing --add-missing --copy
autoconf
......@@ -131,6 +131,7 @@ case $target_os in
MSPLUGINS_CFLAGS=""
MSPLUGINS_LIBS="-dynamiclib"
macosx_found=yes
LIBS="$LIBS -framework CoreFoundation -framework Cocoa"
;;
*mingw*)
CFLAGS="$CFLAGS -DINET6 -DORTP_INET6 -D_WIN32_WINNT=0x0501 -DORTP_STATIC"
......
......@@ -57,8 +57,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#else
#if !defined(__APPLE__)
#include <malloc.h>
#endif
#endif
#define ALLOC(var,size,type) var = alloca(sizeof(type)*(size))
......
......@@ -48,9 +48,9 @@ extern void __register_ffmpeg_encoders_if_possible(void);
#include <dlfcn.h>
#endif
#ifdef __APPLE__
#if defined(__APPLE__) && !defined(__GNUC__)
#import <Cocoa/Cocoa.h>
#include <Foundation/Foundation.h>
#include <Foundation/Foundation.h>
#endif
MSList *ms_list_new(void *data){
......
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