vlc | branch: master | Rafaël Carré <[email protected]> | Sun Jan 22 04:15:57 2012 -0500| [510ceaa45837d38361ca0fcced9bbd0f009d0352] | committer: Rafaël Carré
live555: add needed flags for android > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=510ceaa45837d38361ca0fcced9bbd0f009d0352 --- contrib/src/live555/rules.mak | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak index 0507878..be0c2b2 100644 --- a/contrib/src/live555/rules.mak +++ b/contrib/src/live555/rules.mak @@ -29,9 +29,6 @@ live555: $(LIVE555_FILE) .sum-live555 rm -Rf live $(UNPACK) chmod -R u+w live -ifdef HAVE_ANDROID - patch -p0 < $(SRC)/live555/android.patch -endif ifdef HAVE_WINCE cd live && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw endif @@ -43,6 +40,10 @@ endif -e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' \ -i.orig config.macosx cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux +ifdef HAVE_ANDROID + cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include%' -i.orig config.linux + patch -p0 < $(SRC)/live555/android.patch +endif mv live $@ touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
