aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorbeenje <beenje@xbmc.org>2011-06-23 16:27:27 +0200
committerbeenje <beenje@xbmc.org>2011-06-23 16:46:50 +0200
commitabca582cbeb99f22fa12b7d392b3f097b632b23b (patch)
treec15a6af6556d9118064737515df14570826c1710 /lib
parent62171b3f0be07ba706a777c9c3f64fd3c06f711d (diff)
[osx/ios] fixed libavfilter build on ppc and ios
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.in22
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 424c3295db..343497cdeb 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -73,24 +73,26 @@ $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.dyli
$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) ffmpeg/libavformat/*.o $(BUNDLE1_O)
+ifeq ($(findstring x86,$(ARCH_DIR)), x86)
+$(SYSDIR)/avfilter-1-$(ARCH).so: $(WRAPPER) ffmpeg/libavfilter/libavfilter.dylib
+ $(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
+ $(WRAPPER) ffmpeg/libavfilter/$(ARCH_DIR)/*.o \
+ ffmpeg/libavfilter/*.o $(BUNDLE1_O)
+else # No libavfilter/ppc or libavfilter/arm
+$(SYSDIR)/avfilter-1-$(ARCH).so: $(WRAPPER) ffmpeg/libavfilter/libavfilter.dylib
+ $(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
+ $(WRAPPER) ffmpeg/libavfilter/*.o $(BUNDLE1_O)
+endif
+
ifneq ($(findstring arm,$(ARCH)), arm)
$(SYSDIR)/swscale-0-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.dylib
$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) ffmpeg/libswscale/*.o \
ffmpeg/libswscale/$(ARCH_DIR)/*.o $(BUNDLE1_O)
-
-$(SYSDIR)/avfilter-1-$(ARCH).so: $(WRAPPER) ffmpeg/libavfilter/libavfilter.dylib
- $(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
- $(WRAPPER) ffmpeg/libavfilter/$(ARCH_DIR)/*.o \
- ffmpeg/libavfilter/*.o $(BUNDLE1_O)
-else # No ARM version of swscale and avfilter available yet.
+else # No ARM version of swscale available yet.
$(SYSDIR)/swscale-0-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.dylib
$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) ffmpeg/libswscale/*.o
-
-$(SYSDIR)/avfilter-1-$(ARCH).so: $(WRAPPER) ffmpeg/libavfilter/libavfilter.dylib
- $(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
- $(WRAPPER) ffmpeg/libavfilter/*.o
endif
$(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.dylib