From: prigaux <pri@nopapers.org>
Date: Wed, 14 Feb 2007 10:10:14 +0000 (+0000)
Subject: Add libz.a in the contrib for CYGWIN.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de4ba9eeb0daf41c8810b4d844918e42257d4728;p=handbrake

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 8239c9fc6..d29132eb2 100644
--- 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 2c699810a..8ffa8439f 100644
--- 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 3e7a65971..589090908 100644
--- 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 )