Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-WinRT
Manage
Activity
Members
Labels
Plan
Issues
116
Issue boards
Milestones
Wiki
Code
Merge requests
6
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
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-WinRT
Commits
408ce432
Commit
408ce432
authored
5 years ago
by
Steve Lhomme
Browse files
Options
Downloads
Patches
Plain Diff
libvlc: force build meson
And cmake and libtool when building with LLVM
parent
761390c5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libvlc/compile.sh
+7
-4
7 additions, 4 deletions
libvlc/compile.sh
with
7 additions
and
4 deletions
libvlc/compile.sh
+
7
−
4
View file @
408ce432
...
...
@@ -116,14 +116,17 @@ esac
# Build tools with the native compiler
echo
"Compiling missing tools..."
cd
extras/tools
./bootstrap
&&
make
$MAKEFLAGS
if
[
"
$HAS_CLANG
"
=
"1"
]
;
then
export
PATH
=
"
$PWD
/build/bin"
:
"
$PATH
"
# Force patched meson as newer versions don't add -lpthread properly in libplacebo.pc
FORCED_TOOLS
=
".meson"
if
[
"
${
HAS_CLANG
}
"
=
"1"
]
;
then
# We need a patched version of libtool & cmake, regardless of which
# version is installed on the system.
# cmake can go away when we switch to 3.13.0
make
$MAKEFLAG
S
.cmake .libtool
FORCED_TOOLS
=
"
$FORCED_TOOL
S
.cmake .libtool
"
fi
export
PATH
=
`
pwd
`
/build/bin:
"
$PATH
"
NEEDED
=
"
$FORCED_TOOLS
"
./bootstrap
&&
make
$MAKEFLAGS
cd
../../
EXTRA_CPPFLAGS
=
"-D_WIN32_WINNT=
$WINVER
-DWINVER=
$WINVER
-DWINSTORECOMPAT -D_UNICODE -DUNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP"
...
...
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