Commit af9721e2 authored by Pankaj Yadav's avatar Pankaj Yadav Committed by Jean-Baptiste Kempf

Contribs for Symbian Port

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 25aa0293
...@@ -192,6 +192,9 @@ case $TARGET in ...@@ -192,6 +192,9 @@ case $TARGET in
*wince*) *wince*)
add_enabled_makefile_cfg "HAVE_WINCE" add_enabled_makefile_cfg "HAVE_WINCE"
;; ;;
*symbian*)
add_enabled_makefile_cfg "HAVE_SYMBIAN"
;;
esac esac
# Figure out the correct distro to use # Figure out the correct distro to use
......
#Compiled but not linked libtool broken .faad .mpeg2 .ogg .dvbpsi
all: .a52 .mad \
.lame .ffmpeg
LDFLAGS=-L$(EPOCROOT)/../cls-gcc/arm-none-symbianelf/lib -L$(EPOCROOT)/epoc32/release/armv5/lib -nostdlib -shared -Wl,--no-undefined $(EPOCROOT)/epoc32/release/armv5/lib/libm.dso $(EPOCROOT)/epoc32/release/armv5/lib/libc.dso $(EPOCROOT)/epoc32/release/armv5/lib/libz.dso
EXTRA_CPPFLAGS=-D_UNICODE -D__GCCE__ -D__SYMBIAN32__ -D__S60_3X__ -D__FreeBSD_cc_version -include $(SYMBIAN_INCLUDE)/gcce/gcce.h -I$(SYMBIAN_INCLUDE)/stdapis -I$(SYMBIAN_INCLUDE)/stdapis/sys -I$(SYMBIAN_INCLUDE)/variant -I$(SYMBIAN_INCLUDE)
...@@ -968,8 +968,12 @@ FFMPEGCONF += --enable-cross-compile ...@@ -968,8 +968,12 @@ FFMPEGCONF += --enable-cross-compile
endif endif
ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX
ifndef HAVE_ANDROID ifndef HAVE_ANDROID
ifndef HAVE_SYMBIAN
FFMPEGCONF += --cross-prefix=$(HOST)- FFMPEGCONF += --cross-prefix=$(HOST)-
else else
FFMPEGCONF += --cross-prefix=arm-none-symbianelf- --arch=armv6 --disable-asm
endif
else
FFMPEGCONF += --cross-prefix=arm-linux-androideabi- --arch=armv4l FFMPEGCONF += --cross-prefix=arm-linux-androideabi- --arch=armv4l
endif endif
endif endif
...@@ -1051,6 +1055,10 @@ FFMPEGCONF += --target-os=linux ...@@ -1051,6 +1055,10 @@ FFMPEGCONF += --target-os=linux
FFMPEGCONF += --enable-pic FFMPEGCONF += --enable-pic
endif endif
ifdef HAVE_SYMBIAN
FFMPEGCONF += --target-os=none
endif
ifdef HAVE_MAEMO ifdef HAVE_MAEMO
ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),) ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8 FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8
...@@ -1132,6 +1140,7 @@ FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib ...@@ -1132,6 +1140,7 @@ FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib
FFMPEG_DEPS-$(HAVE_MACOSX) += .yasm FFMPEG_DEPS-$(HAVE_MACOSX) += .yasm
FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers
FFMPEG_DEPS-$(HAVE_ANDROID) = FFMPEG_DEPS-$(HAVE_ANDROID) =
FFMPEG_DEPS-$(HAVE_SYMBIAN) =
ifdef SVN ifdef SVN
FFMPEG_MK_TARGET = ffmpeg/.svn-$(FFMPEG_SVN_REV) FFMPEG_MK_TARGET = ffmpeg/.svn-$(FFMPEG_SVN_REV)
......
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