Commit f1254d96 authored by Gildas Bazin's avatar Gildas Bazin

* extras/contrib/src/Makefile, extras/contrib/src/Patches/zlib.patch: added...

* extras/contrib/src/Makefile, extras/contrib/src/Patches/zlib.patch: added zlib to the wince contrib.
parent 7f7eeb17
...@@ -141,11 +141,11 @@ else ...@@ -141,11 +141,11 @@ else
ifdef HAVE_WINCE ifdef HAVE_WINCE
all: .dvbpsi .ffmpeg all: .dvbpsi .zlib .ffmpeg
else else
# Standard Linux or other UNIX-like systems # Standard Linux or other UNIX-like systems
all: .iconv .intl .freetype .fribidi .zlib\ all: .iconv .intl .freetype .fribidi .zlib \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .faac .lame .ebml .dts .matroska .ffmpeg .dvdcss \ .FLAC .speex .faad .faac .lame .ebml .dts .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame\ .live .goom2k4 .caca .mod .x264 .xml .twolame\
...@@ -832,7 +832,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz: ...@@ -832,7 +832,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
# patch -p 0 < Patches/ffmpeg.patch # patch -p 0 < Patches/ffmpeg.patch
ifdef HAVE_WINCE ifdef HAVE_WINCE
.ffmpeg: ffmpeg .ffmpeg: ffmpeg .zlib
else else
.ffmpeg: ffmpeg .faac .lame .ffmpeg: ffmpeg .faac .lame
endif endif
...@@ -1243,9 +1243,10 @@ zlib-$(ZLIB_VERSION).tar.gz: ...@@ -1243,9 +1243,10 @@ zlib-$(ZLIB_VERSION).tar.gz:
zlib: zlib-$(ZLIB_VERSION).tar.gz zlib: zlib-$(ZLIB_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p 0 < Patches/zlib.patch
.zlib: zlib .zlib: zlib
(cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make && make install) (cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install)
$(INSTALL_NAME) $(INSTALL_NAME)
touch $@ touch $@
......
--- zlib/gzio.c 2005-07-11 21:31:48.000000000 +0100
+++ zlib/gzio.c 2005-11-22 22:26:26.000000000 +0000
@@ -35,6 +35,10 @@
FILE *fdopen(int, const char *);
#endif
+#ifdef UNDER_CE
+# define fdopen(fd, fmode) 0
+#endif
+
#ifndef STDC
extern voidp malloc OF((uInt size));
extern void free OF((voidpf ptr));
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