Skip to content

V
vlc-2-2
Commit 510ceaa4 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

live555: add needed flags for android

parent a6e2d066
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
contrib/src/live555/rules.mak
View file @ 510ceaa4
...@@ -29,9 +29,6 @@ live555: $(LIVE555_FILE) .sum-live555 ...@@ -29,9 +29,6 @@ live555: $(LIVE555_FILE) .sum-live555
rm -Rf live rm -Rf live
$(UNPACK) $(UNPACK)
chmod -R u+w live chmod -R u+w live
ifdef HAVE_ANDROID
patch -p0 < $(SRC)/live555/android.patch
endif
ifdef HAVE_WINCE ifdef HAVE_WINCE
cd live && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw cd live && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw
endif endif
...@@ -43,6 +40,10 @@ endif ...@@ -43,6 +40,10 @@ endif
-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' \ -e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' \
-i.orig config.macosx -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 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 $@ mv live $@
touch $@ touch $@
......
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