Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
529
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
3acbace0
Commit
3acbace0
authored
8 years ago
by
Steve Lhomme
Committed by
Thomas Guillem
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
copy uchar.h in our contrib include folder, not in the toolchain
Signed-off-by:
Thomas Guillem
<
thomas@gllm.fr
>
parent
5916c9d5
No related branches found
No related tags found
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
compile-libvlc.sh
+7
-4
7 additions, 4 deletions
compile-libvlc.sh
with
7 additions
and
4 deletions
compile-libvlc.sh
+
7
−
4
View file @
3acbace0
...
...
@@ -308,10 +308,6 @@ then
fi
if
[
!
-z
"
${
NDK_FORCE_ARG
}
"
]
;
then
# don't use the dummy uchar.c
cp
${
ANDROID_NDK
}
/platforms/android-21/arch-
${
PLATFORM_SHORT_ARCH
}
/usr/include/uchar.h
\
${
NDK_TOOLCHAIN_DIR
}
/sysroot/usr/local/include
# Don't mess up nl_langinfo() detection since this symbol is not present for 64
# bits
if
[
"
${
HAVE_64
}
"
=
1
]
;
then
...
...
@@ -477,6 +473,13 @@ fi
echo
"Building the contribs"
mkdir
-p
contrib/contrib-android-
${
TARGET_TUPLE
}
# don't use the dummy uchar.c
if
[
!
-f
contrib/
${
TARGET_TUPLE
}
/include/uchar.h
]
;
then
mkdir
-p
contrib/
${
TARGET_TUPLE
}
/include
cp
${
ANDROID_NDK
}
/platforms/android-24/arch-
${
PLATFORM_SHORT_ARCH
}
/usr/include/uchar.h
\
contrib/
${
TARGET_TUPLE
}
/include/uchar.h
fi
gen_pc_file
()
{
echo
"Generating
$1
pkg-config file"
echo
"Name:
$1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment