Skip to content

V
vlc
Commit e25946ed authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contrib: improve build rules for ffmpeg and libpostproc for iOS in case arch != arm

parent f0cf9397
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
contrib/src/ffmpeg/rules.mak
View file @ e25946ed
...@@ -60,8 +60,6 @@ endif ...@@ -60,8 +60,6 @@ endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
FFMPEGCONF += --arch=$(ARCH) --target-os=darwin FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
FFMPEG_CFLAGS += -DHAVE_LRINTF FFMPEG_CFLAGS += -DHAVE_LRINTF
endif
ifdef HAVE_MACOSX
ifneq ($(findstring $(ARCH),i386 x86_64),) ifneq ($(findstring $(ARCH),i386 x86_64),)
FFMPEGCONF += --enable-memalign-hack FFMPEGCONF += --enable-memalign-hack
endif endif
...@@ -70,7 +68,7 @@ FFMPEGCONF += --cpu=core2 ...@@ -70,7 +68,7 @@ FFMPEGCONF += --cpu=core2
endif endif
endif endif
ifdef HAVE_IOS ifdef HAVE_IOS
FFMPEGCONF += --as="$(AS)" --enable-pic FFMPEGCONF += --enable-pic --as="$(AS)" --disable-decoder=snow
ifeq ($(ARCH), arm) ifeq ($(ARCH), arm)
FFMPEGCONF += --cpu=cortex-a8 FFMPEGCONF += --cpu=cortex-a8
endif endif
......
contrib/src/postproc/rules.mak
View file @ e25946ed
...@@ -31,11 +31,14 @@ endif ...@@ -31,11 +31,14 @@ endif
endif endif
# Darwin # Darwin
ifdef HAVE_MACOSX ifdef HAVE_DARWIN_OS
POSTPROCCONF += --arch=$(ARCH) --target-os=darwin POSTPROCCONF += --arch=$(ARCH) --target-os=darwin
endif endif
ifdef HAVE_IOS ifdef HAVE_IOS
POSTPROCCONF += --cpu=cortex-a8 --as="$(AS)" --target-os=darwin POSTPROCCONF += --as="$(AS)"
ifeq ($(ARCH),arm)
POSTPROCCONF += --cpu=cortex-a8
endif
endif endif
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
POSTPROCCONF += --cpu=core2 POSTPROCCONF += --cpu=core2
......
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