Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Casanowow Life for love
VLC-Android
Commits
d3e1c611
Commit
d3e1c611
authored
Jun 22, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Complete the release process
parent
1de7c78d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
Makefile
Makefile
+9
-2
compile.sh
compile.sh
+3
-2
No files found.
Makefile
View file @
d3e1c611
...
...
@@ -9,7 +9,6 @@ endif
SRC
=
vlc-android
JAVA_SOURCES
=
$(SRC)
/src/org/videolan/vlc/
*
.java
JNI_SOURCES
=
$(SRC)
/jni/
*
.c
$(SRC)
/jni/
*
.h
VLC_APK
=
$(SRC)
/bin/VLC-debug.apk
LIBVLCJNI
=
\
$(SRC)
/obj/local/
$(ARCH)
/libvlcjni.so
\
$(SRC)
/obj/local/
$(ARCH)
/libiomx-ics.so
\
...
...
@@ -30,11 +29,19 @@ VERBOSE = @
GEN
=
@echo
"Generating"
$@
;
endif
ifneq
($(RELEASE),)
ANT_TARGET
=
release
VLC_APK
=
$(SRC)
/bin/VLC-release-unsigned.apk
else
ANT_TARGET
=
debug
VLC_APK
=
$(SRC)
/bin/VLC-debug.apk
endif
$(VLC_APK)
:
$(LIBVLCJNI) $(JAVA_SOURCES)
@
echo
@
echo
"=== Building
$@
for
$(ARCH)
==="
@
echo
$(VERBOSE)
cd
$(SRC)
&&
ant
$(ANT_OPTS)
debug
$(VERBOSE)
cd
$(SRC)
&&
ant
$(ANT_OPTS)
$(ANT_TARGET)
VLC_MODULES
=
`
./find_modules.sh
$(VLC_BUILD_DIR)
`
...
...
compile.sh
View file @
d3e1c611
...
...
@@ -103,9 +103,10 @@ if test -z "${NO_NEON}" -o -n "${TEGRA2}"; then
fi
# Release or not?
if
[
$
1
==
"release"
]
;
then
if
[
$
#
-ne
0
]
&&
[
"
$1
"
==
"release"
]
;
then
OPTS
=
""
echo
"EXTRA_CFLAGS += -DNDEBUG"
>>
config.mak
MAKEFLAGS
=
"RELEASE=1"
else
OPTS
=
"--enable-debug"
fi
...
...
@@ -140,4 +141,4 @@ export ANDROID_LIBS=${PWD}/android-libs
export
VLC_BUILD_DIR
=
vlc/android
make distclean
make
make
$MAKEFLAGS
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