Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
e25946ed
Commit
e25946ed
authored
Mar 24, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: improve build rules for ffmpeg and libpostproc for iOS in case arch != arm
parent
f0cf9397
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+1
-3
contrib/src/postproc/rules.mak
contrib/src/postproc/rules.mak
+5
-2
No files found.
contrib/src/ffmpeg/rules.mak
View file @
e25946ed
...
...
@@ -60,8 +60,6 @@ endif
ifdef
HAVE_DARWIN_OS
FFMPEGCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
FFMPEG_CFLAGS
+=
-DHAVE_LRINTF
endif
ifdef
HAVE_MACOSX
ifneq
($(findstring $(ARCH),i386 x86_64),)
FFMPEGCONF
+=
--enable-memalign-hack
endif
...
...
@@ -70,7 +68,7 @@ FFMPEGCONF += --cpu=core2
endif
endif
ifdef
HAVE_IOS
FFMPEGCONF
+=
--
as
=
"
$(AS)
"
--enable-pic
FFMPEGCONF
+=
--
enable-pic
--as
=
"
$(AS)
"
--disable-decoder
=
snow
ifeq
($(ARCH), arm)
FFMPEGCONF
+=
--cpu
=
cortex-a8
endif
...
...
contrib/src/postproc/rules.mak
View file @
e25946ed
...
...
@@ -31,11 +31,14 @@ endif
endif
# Darwin
ifdef
HAVE_
MACOSX
ifdef
HAVE_
DARWIN_OS
POSTPROCCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
endif
ifdef
HAVE_IOS
POSTPROCCONF
+=
--cpu
=
cortex-a8
--as
=
"
$(AS)
"
--target-os
=
darwin
POSTPROCCONF
+=
--as
=
"
$(AS)
"
ifeq
($(ARCH),arm)
POSTPROCCONF
+=
--cpu
=
cortex-a8
endif
endif
ifeq
($(ARCH),x86_64)
POSTPROCCONF
+=
--cpu
=
core2
...
...
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