Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-WinRT
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Martin Finkel
VLC-WinRT
Commits
226b0613
Commit
226b0613
authored
4 years ago
by
Martin Finkel
Browse files
Options
Downloads
Patches
Plain Diff
try fix x264 build on uwp
parent
35ccf1ae
No related branches found
No related tags found
No related merge requests found
Pipeline
#18269
failed with stage
in 31 minutes and 38 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libvlc/patches/0042-try-fix-UWP-build.patch
+25
-0
25 additions, 0 deletions
libvlc/patches/0042-try-fix-UWP-build.patch
with
25 additions
and
0 deletions
libvlc/patches/0042-try-fix-UWP-build.patch
0 → 100644
+
25
−
0
View file @
226b0613
From a8bf4044b74e60f92094c8c9ec951887d225b442 Mon Sep 17 00:00:00 2001
From: Martin Finkel <finkel2804@gmail.com>
Date: Tue, 2 Jun 2020 16:50:45 +0200
Subject: [PATCH 1/1] try fix UWP build
---
contrib/src/x264/rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index cb61370..ce21e6e 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -33,7 +33,7 @@
X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" \
--disable-opencl
ifndef HAVE_WIN32
X264CONF += --enable-pic
-else
+else ifndef HAVE_WINSTORE
X264CONF += --enable-win32thread
endif
ifdef HAVE_CROSS_COMPILE
--
2.25.1.windows.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