Commit 4a8d3884 authored by Felix Paul Kühne's avatar Felix Paul Kühne

contrib/ffmpeg: fixed compilation for the iOS simulator

parent 4dd980cb
...@@ -61,8 +61,10 @@ endif ...@@ -61,8 +61,10 @@ endif
# x86 stuff # x86 stuff
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
ifndef HAVE_DARWIN_OS
FFMPEGCONF += --arch=x86 FFMPEGCONF += --arch=x86
endif endif
endif
# Darwin # Darwin
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
...@@ -75,8 +77,10 @@ FFMPEGCONF += --cpu=core2 ...@@ -75,8 +77,10 @@ FFMPEGCONF += --cpu=core2
endif endif
endif endif
ifdef HAVE_IOS ifdef HAVE_IOS
ifeq ($(ARCH),arm)
FFMPEGCONF += --enable-pic --as="$(AS)" FFMPEGCONF += --enable-pic --as="$(AS)"
endif endif
endif
# Linux # Linux
ifdef HAVE_LINUX ifdef HAVE_LINUX
......
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