Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
f6c4e22e
Commit
f6c4e22e
authored
Mar 21, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib/ffmpeg: cleaned up compilation for iOS
parent
3ef9d0a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+4
-1
contrib/src/main.mak
contrib/src/main.mak
+5
-0
No files found.
contrib/src/ffmpeg/rules.mak
View file @
f6c4e22e
...
...
@@ -70,7 +70,10 @@ FFMPEGCONF += --cpu=core2
endif
endif
ifdef
HAVE_IOS
FFMPEGCONF
+=
--as
=
"
$(TOPSRC)
/../extras/tools/gas/gas-preprocessor.pl
$(CC)
"
--enable-pic
FFMPEGCONF
+=
--as
=
"
$(AS)
"
--enable-pic
ifeq
($(ARCH), arm)
FFMPEGCONF
+=
--cpu
=
cortex-a8
endif
endif
# Linux
...
...
contrib/src/main.mak
View file @
f6c4e22e
...
...
@@ -150,6 +150,11 @@ endif
ifdef
HAVE_IOS
CC
=
xcrun clang
CXX
=
xcrun clang++
ifeq
($(ARCH), arm)
AS
=
perl
$(
abspath
../../extras/tools/build/bin/gas-preprocessor.pl
)
$(CC)
else
AS
=
xcrun as
endif
AR
=
xcrun ar
LD
=
xcrun ld
STRIP
=
xcrun strip
...
...
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