Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
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
Commits
e25946ed
Commit
e25946ed
authored
13 years ago
by
Felix Paul Kühne
Browse files
Options
Downloads
Patches
Plain Diff
contrib: improve build rules for ffmpeg and libpostproc for iOS in case arch != arm
parent
f0cf9397
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/ffmpeg/rules.mak
+1
-3
1 addition, 3 deletions
contrib/src/ffmpeg/rules.mak
contrib/src/postproc/rules.mak
+5
-2
5 additions, 2 deletions
contrib/src/postproc/rules.mak
with
6 additions
and
5 deletions
contrib/src/ffmpeg/rules.mak
+
1
−
3
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
)
"
--
en
able-
pic
FFMPEGCONF
+=
--enable-pic
--as
=
"
$(
AS
)
"
--
dis
able-
decoder
=
snow
ifeq
($(ARCH), arm)
FFMPEGCONF
+=
--cpu
=
cortex-a8
endif
...
...
This diff is collapsed.
Click to expand it.
contrib/src/postproc/rules.mak
+
5
−
2
View file @
e25946ed
...
...
@@ -31,11 +31,14 @@ endif
endif
# Darwin
ifdef
HAVE_
MAC
OS
X
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
...
...
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