Commit bc28b885 authored by Pierre's avatar Pierre
Browse files

contrib: Don't assume DARWIN_OS is Mac OS X.

parent 1688b979
...@@ -155,14 +155,15 @@ endif ...@@ -155,14 +155,15 @@ endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
X264CONF=--host=$(HOST) X264CONF=--host=$(HOST)
X264CONF += --enable-pic X264CONF += --enable-pic
FFMPEGCONF += --enable-libvpx
ifdef HAVE_DARWIN_32 ifdef HAVE_DARWIN_32
FFMPEGCONF += --enable-libvpx
FFMPEGCONF += --cc=gcc-4.0 FFMPEGCONF += --cc=gcc-4.0
else else
FFMPEGCONF += --cc=$(CC) FFMPEGCONF += --cc=$(CC)
endif endif
FFMPEGCONF += --arch=$(ARCH) FFMPEGCONF += --arch=$(ARCH)
ifdef HAVE_DARWIN_64 ifdef HAVE_DARWIN_64
FFMPEGCONF += --enable-libvpx
FFMPEGCONF += --cpu=core2 FFMPEGCONF += --cpu=core2
X264CONF+=--host=x86_64-apple-darwin10 X264CONF+=--host=x86_64-apple-darwin10
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment