vlc | branch: master | Pankaj Yadav <pankajdnaps...@gmail.com> | Sat Jan 22 20:07:57 2011 +0530| [af9721e24d7a46056f59ddaa3228fdc7e78cf503] | committer: Jean-Baptiste Kempf
Contribs for Symbian Port Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=af9721e24d7a46056f59ddaa3228fdc7e78cf503 --- extras/contrib/bootstrap | 3 +++ extras/contrib/src/Distributions/symbian.mak | 5 +++++ extras/contrib/src/contrib-src.mak | 9 +++++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap index ba7191e..32f4009 100755 --- a/extras/contrib/bootstrap +++ b/extras/contrib/bootstrap @@ -192,6 +192,9 @@ case $TARGET in *wince*) add_enabled_makefile_cfg "HAVE_WINCE" ;; + *symbian*) + add_enabled_makefile_cfg "HAVE_SYMBIAN" + ;; esac # Figure out the correct distro to use diff --git a/extras/contrib/src/Distributions/symbian.mak b/extras/contrib/src/Distributions/symbian.mak new file mode 100644 index 0000000..11d0a61 --- /dev/null +++ b/extras/contrib/src/Distributions/symbian.mak @@ -0,0 +1,5 @@ +#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) diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index b141e91..f8a8f1f 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -968,8 +968,12 @@ FFMPEGCONF += --enable-cross-compile endif ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX ifndef HAVE_ANDROID +ifndef HAVE_SYMBIAN FFMPEGCONF += --cross-prefix=$(HOST)- else +FFMPEGCONF += --cross-prefix=arm-none-symbianelf- --arch=armv6 --disable-asm +endif +else FFMPEGCONF += --cross-prefix=arm-linux-androideabi- --arch=armv4l endif endif @@ -1051,6 +1055,10 @@ FFMPEGCONF += --target-os=linux FFMPEGCONF += --enable-pic endif +ifdef HAVE_SYMBIAN +FFMPEGCONF += --target-os=none +endif + ifdef HAVE_MAEMO ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),) FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8 @@ -1132,6 +1140,7 @@ FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib FFMPEG_DEPS-$(HAVE_MACOSX) += .yasm FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers FFMPEG_DEPS-$(HAVE_ANDROID) = +FFMPEG_DEPS-$(HAVE_SYMBIAN) = ifdef SVN FFMPEG_MK_TARGET = ffmpeg/.svn-$(FFMPEG_SVN_REV) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits