Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
92691c21
Commit
92691c21
authored
Nov 02, 2011
by
Felix Paul Kühne
Browse files
old contribs: compilation fixes and compiler experiment
parent
412774e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
extras/contrib/bootstrap
View file @
92691c21
...
...
@@ -320,12 +320,12 @@ case "$DISTRO" in
add_makefile_cfg
"IOS_SDK_ROOT =
${
IOS_SDK_ROOT
}
"
;;
macosx
*
)
SDK_TARGET
=
10.
5
SDK_TARGET
=
10.
6
HAVE_MACOSX_DARWIN_9
=
1
EXTRA_LDFLAGS
=
"
${
EXTRA_LDFLAGS
}
-isysroot
\$
{MACOSX_SDK} -Wl,-syslibroot,
\$
{MACOSX_SDK} -mmacosx-version-min=
\$
{SDK_TARGET}"
EXTRA_CFLAGS
=
"
${
EXTRA_CFLAGS
}
-D
\$
{ENVP} -isysroot
\$
{MACOSX_SDK} -mmacosx-version-min=
\$
{SDK_TARGET}"
CC
=
"/usr/bin/
gcc
"
CXX
=
"/usr/bin/g++"
CC
=
"/usr/bin/
clang
"
CXX
=
"/usr/bin/
clan
g++"
LD
=
"ld"
RANLIB
=
"ranlib"
AR
=
...
...
extras/contrib/src/contrib-src.mak
View file @
92691c21
...
...
@@ -847,8 +847,8 @@ VPX_TARGET-$(ENABLED) = --target=FIXME
VPX_TARGET-$(HAVE_LINUX)
=
VPX_TARGET-$(HAVE_WIN32)
=
--target
=
x86-win32-gcc
VPX_TARGET-$(HAVE_DARWIN_OS)
=
--target
=
ppc32-darwin9-gcc
VPX_TARGET-$(HAVE_MACOSX_ON_INTEL)
=
--target
=
x86-darwin
9
-gcc
VPX_TARGET-$(HAVE_MACOSX64)
=
--target
=
x86_64-darwin
9
-gcc
VPX_TARGET-$(HAVE_MACOSX_ON_INTEL)
=
--target
=
x86-darwin
10
-gcc
VPX_TARGET-$(HAVE_MACOSX64)
=
--target
=
x86_64-darwin
10
-gcc
VPX_DEPS-$(ENABLED)
=
VPX_DEPS-$(HAVE_MACOSX_ON_INTEL)
+=
.yasm
...
...
@@ -948,6 +948,7 @@ FFMPEGCONF += --enable-cross-compile
endif
ifdef
HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX
ifndef
HAVE_MACOSX
ifndef
HAVE_ANDROID
ifndef
HAVE_SYMBIAN
FFMPEGCONF
+=
--cross-prefix
=
$(HOST)
-
...
...
@@ -960,6 +961,7 @@ FFMPEGCONF += --cross-prefix=arm-linux-androideabi- --arch=armv6
FFMPEGCONF
+=
$(FFMPEGCONFSMALL)
endif
endif
endif
ifdef
CC
FFMPEGCONF
+=
--cc
=
"
$(CC)
"
...
...
@@ -989,12 +991,12 @@ endif
ifdef
HAVE_MACOSX32
FFMPEGCONF
+=
--enable-libvpx
FFMPEGCONF
+=
--cc
=
gcc-4.2
FFMPEGCONF
+=
--cc
=
clang
endif
ifdef
HAVE_MACOSX64
FFMPEGCONF
+=
--enable-libvpx
FFMPEGCONF
+=
--cc
=
gcc-4.2
FFMPEGCONF
+=
--cc
=
clang
FFMPEGCONF
+=
--cpu
=
core2
endif
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment