Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Casanowow Life for love
VLC-Android
Commits
570c1a4d
Commit
570c1a4d
authored
Jan 23, 2012
by
Rafaël Carré
Browse files
Revert "For now, bypass live555"
This reverts commit
0d64504c
.
parent
03a94248
Changes
2
Hide whitespace changes
Inline
Side-by-side
compile.sh
View file @
570c1a4d
...
...
@@ -46,8 +46,7 @@ mkdir contrib/android; cd contrib/android
--disable-caca
\
--disable-gettext
\
--disable-mpcdec
\
--disable-sidplay2
\
--disable-live555
--disable-sidplay2
make fetch
make
...
...
vlc-android/jni/Android.mk
View file @
570c1a4d
...
...
@@ -30,9 +30,8 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
-lavformat
-lavcodec
-lswscale
-lavutil
-lpostproc
\
-lmpeg2
-lpng
-ldvbpsi
-llog
-la52
-lebml
-lmatroska
-ltag
\
-lgsm
-lopenjpeg
-lgme
-lupnp
-lixml
-lthreadutil
-lxml2
-lsamplerate
\
-lliveMedia
-lUsageEnvironment
-lBasicUsageEnvironment
-lgroupsock
\
$(CPP_STATIC)
#-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
# until live555 is fixed
include
$(BUILD_SHARED_LIBRARY)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment