Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLCKit
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Marvin Scholz
VLCKit
Commits
fcaefc57
Commit
fcaefc57
authored
Jan 20, 2019
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
patches: compilation fix for macOS
parent
d17a73f9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
Resources/MobileVLCKit/patches/0026-contrib-add-meson-support-for-iOS-macOS-and-tvOS.patch
...26-contrib-add-meson-support-for-iOS-macOS-and-tvOS.patch
+10
-6
No files found.
Resources/MobileVLCKit/patches/0026-contrib-add-meson-support-for-iOS-and-tvOS.patch
→
Resources/MobileVLCKit/patches/0026-contrib-add-meson-support-for-iOS-
macOS-
and-tvOS.patch
View file @
fcaefc57
From
c656dad17eaf001b5ee1e685d8b778f9b9b98598
Mon Sep 17 00:00:00 2001
From
bd9e279907ce374ecb0e99b583b04c6af6d12993
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Fri, 18 Jan 2019 21:44:13 +0100
Date: Fri, 18 Jan 2019 21:44:13 +0100
Subject: [PATCH 26/26] contrib: add meson support for iOS and tvOS
Subject: [PATCH 26/26] contrib: add meson support for iOS
, macOS
and tvOS
---
---
contrib/bootstrap | 20 +++++++++++++++++---
contrib/bootstrap | 20 +++++++++++++++++---
contrib/src/main.mak | 1
1
++++++++++-
contrib/src/main.mak | 1
5 ++++
++++++++++-
2 files changed,
27
insertions(+), 4 deletions(-)
2 files changed,
31
insertions(+), 4 deletions(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
diff --git a/contrib/bootstrap b/contrib/bootstrap
index 20ce524926..b7cab040a5 100755
index 20ce524926..b7cab040a5 100755
...
@@ -40,10 +40,10 @@ index 20ce524926..b7cab040a5 100755
...
@@ -40,10 +40,10 @@ index 20ce524926..b7cab040a5 100755
fi
fi
if test "$BUILDFORTVOS"
if test "$BUILDFORTVOS"
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 6b70974651..
ffb1ba8cf3
100644
index 6b70974651..
b062ba6c91
100644
--- a/contrib/src/main.mak
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -538,12 +538,2
1
@@
crossfile.meson:
@@ -538,12 +538,2
5
@@
crossfile.meson:
echo "windres = '$(WINDRES)'" >> $@
echo "windres = '$(WINDRES)'" >> $@
echo "[properties]" >> $@
echo "[properties]" >> $@
echo "needs_exe_wrapper = true" >> $@
echo "needs_exe_wrapper = true" >> $@
...
@@ -55,6 +55,10 @@ index 6b70974651..ffb1ba8cf3 100644
...
@@ -55,6 +55,10 @@ index 6b70974651..ffb1ba8cf3 100644
+ echo "c_args = ['-isysroot', '$(IOS_SDK)', '-miphoneos-version-min=8.4', '-arch', '$(PLATFORM_SHORT_ARCH)']" >> $@
+ echo "c_args = ['-isysroot', '$(IOS_SDK)', '-miphoneos-version-min=8.4', '-arch', '$(PLATFORM_SHORT_ARCH)']" >> $@
+ echo "c_link_args = ['-isysroot', '$(IOS_SDK)', '-arch', '$(PLATFORM_SHORT_ARCH)']" >> $@
+ echo "c_link_args = ['-isysroot', '$(IOS_SDK)', '-arch', '$(PLATFORM_SHORT_ARCH)']" >> $@
+endif
+endif
+endif
+ifdef HAVE_MACOSX
+ echo "c_args = ['-isysroot', '$(MACOSX_SDK)', '-mmacosx-version-min=10.10', '-arch', '$(ARCH)']" >> $@
+ echo "c_link_args = ['-isysroot', '$(MACOSX_SDK)', '-arch', '$(ARCH)']" >> $@
+endif
+endif
ifdef HAVE_CROSS_COMPILE
ifdef HAVE_CROSS_COMPILE
echo "[host_machine]" >> $@
echo "[host_machine]" >> $@
...
...
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