Add libz.a in the contrib for CYGWIN.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2@329 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 8239c9fc6f0667d9e10965ea1b5dfa0234ef1b24..d29132eb2004e47751c60aecf323d6ac45ef71ca 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -339,7 +339,27 @@ actions LibXvidCore
     cd build/generic/ && ./configure && make libxvidcore.a &&
     cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
     cp ../../src/xvid.h $CONTRIB/include/ &&
-    strip -S $CONTRIB/lib/libxvidcore.a && touch $CONTRIB/.contrib
+    strip -S $CONTRIB/lib/libxvidcore.a
 }
 Wget        $(SUBDIR)/xvidcore.tar.gz   : $(SUBDIR)/version_xvidcore.txt ;
 LibXvidCore $(SUBDIR)/lib/libxvidcore.a : $(SUBDIR)/xvidcore.tar.gz ;
+
+# zlib
+if $(OS) = CYGWIN
+{
+rule Zlib
+{
+    Depends $(<) : $(>) ;
+    Depends lib  : $(<) ;
+}
+actions Zlib
+{
+    cd `dirname $(>)` && CONTRIB=`pwd` &&
+    rm -rf zlib && tar xzf zlib.tar.gz &&
+    cd zlib && 
+    ./configure --prefix=$CONTRIB && make && make install &&
+    strip -S $CONTRIB/lib/libz.a && touch $CONTRIB/.contrib
+}
+Wget        $(SUBDIR)/zlib.tar.gz   : $(SUBDIR)/version_zlib.txt ;
+Zlib $(SUBDIR)/lib/libz.a : $(SUBDIR)/zlib.tar.gz ;
+}

diff --git a/libmediafork/Makefile b/libmediafork/Makefile
index 2c699810a9d0c6db3be19edbc74183e560406ba3..8ffa8439f4fe003cd1bcbfb6899f6fcc619312f1 100644 (file)
--- a/libmediafork/Makefile
+++ b/libmediafork/Makefile
@@ -32,7 +32,7 @@ OBJS = $(OTMP:%.cpp=%.o)
 ifeq ($(SYSTEM),CYGWIN_NT-5.1)
 CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
            ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \
-           ../contrib/lib/libdvdread.a \
+           ../contrib/lib/libdvdread.a ../contrib/lib/libz.a \
            ../contrib/lib/libfaac.a ../contrib/lib/libmp3lame.a \
            ../contrib/lib/libmpeg2.a ../contrib/lib/libmpeg2convert.a \
            ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \

diff --git a/test/Makefile b/test/Makefile
index 3e7a6597146bf4c63750efa4e049efb00014776a..589090908a84454813b7dc1d25e340281a84fcd6 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,6 +4,7 @@ ifeq ($(SYSTEM),CYGWIN_NT-5.1)
        LIBS = a52 avformat avcodec avutil dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2
 else
         LIBS = a52 avformat avcodec avutil dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2
+       LDFLAGS += -lz
 endif
 
 all: ../MediaForkCLI
@@ -17,7 +18,7 @@ LDFLAGS += $(LIBS2)
        @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \
        ( echo "Compile line for $@ was:"; echo $$CMD; false )
        @echo "Link MediaForkCLI"
-       @CMD="g++ $(CXXFLAGS) -o ../MediaForkCLI test.o $(LDFLAGS) -lz -lpthread"; $$CMD || \
+       @CMD="g++ $(CXXFLAGS) -o ../MediaForkCLI test.o $(LDFLAGS) -lpthread"; $$CMD || \
        ( echo "Compile line for $@ was:"; echo $$CMD; false )