vlc | branch: master | Rafaël Carré <[email protected]> | Tue Nov 22 21:51:28 2011 -0500| [a6f96090fc33e438a10df98af057ad0c85a0e478] | committer: Rafaël Carré
contrib: fix live555 build on osx > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a6f96090fc33e438a10df98af057ad0c85a0e478 --- contrib/TODO | 3 --- contrib/src/live555/rules.mak | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/TODO b/contrib/TODO index 48e4029..5b17fc9 100644 --- a/contrib/TODO +++ b/contrib/TODO @@ -11,9 +11,6 @@ dvdcss gnutls, gpg-error infrastructure mismatch between Makefile.in.in and autoconf macros (different gettext vers) -live555 - use old libtool options (/usr/bin/libtool), we use GNU - ### Missing software for MacOSX (was present in extras/contrib) # These 3 are binary framework downloads : no source code is used diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak index a1af0da..a267981 100644 --- a/contrib/src/live555/rules.mak +++ b/contrib/src/live555/rules.mak @@ -45,6 +45,9 @@ endif ifdef HAVE_WINCE cd $< && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw endif +ifdef HAVE_MACOSX + cd $< && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx* +endif cd $< && sed \ -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \ -e 's%cc%$(CC)%' \ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
