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
1b943fd7
Commit
1b943fd7
authored
Oct 10, 2014
by
Thomas Guillem
Committed by
Jean-Baptiste Kempf
Oct 11, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: fix cross-compile for x86_64
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
34fef72d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+7
-0
contrib/src/gcrypt/rules.mak
contrib/src/gcrypt/rules.mak
+3
-0
contrib/src/postproc/rules.mak
contrib/src/postproc/rules.mak
+5
-0
No files found.
contrib/src/ffmpeg/rules.mak
View file @
1b943fd7
...
...
@@ -100,6 +100,13 @@ FFMPEGCONF += --arch=x86
endif
endif
# x86_64 stuff
ifeq
($(ARCH),x86_64)
ifndef
HAVE_DARWIN_OS
FFMPEGCONF
+=
--arch
=
x86_64
endif
endif
# Darwin
ifdef
HAVE_DARWIN_OS
FFMPEGCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
...
...
contrib/src/gcrypt/rules.mak
View file @
1b943fd7
...
...
@@ -40,6 +40,9 @@ ifdef HAVE_ANDROID
ifeq
($(ANDROID_ABI), x86)
GCRYPT_CONF
+=
ac_cv_sys_symbol_underscore
=
no
endif
ifeq
($(ANDROID_ABI), x86_64)
GCRYPT_CONF
+=
ac_cv_sys_symbol_underscore
=
no
endif
endif
.gcrypt
:
libgcrypt
...
...
contrib/src/postproc/rules.mak
View file @
1b943fd7
...
...
@@ -50,6 +50,11 @@ ifeq ($(ARCH),i386)
POSTPROCCONF
+=
--arch
=
x86
endif
# x86_64 stuff
ifeq
($(ARCH),x86_64)
POSTPROCCONF
+=
--arch
=
x64_64
endif
# Darwin
ifdef
HAVE_DARWIN_OS
POSTPROCCONF
+=
--arch
=
$(ARCH)
--target-os
=
darwin
...
...
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