Cygwin:

- We compile libz but don't actually link it in on cygwin. This is fixed. 
- Added bzip2 lib which means we can get rid of another cygwin dll.

These are cygwin only so have no affect on any other platform.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1740 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 19 insertions, 0 deletions

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 9bd41485b..ecfe38299 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -476,3 +476,22 @@ if $(OS) = CYGWIN
     Wget  $(SUBDIR)/zlib.tar.gz : $(SUBDIR)/version_zlib.txt ;
     Zlib  $(SUBDIR)/lib/libz.a  : $(SUBDIR)/zlib.tar.gz ;
 }
+
+# bzip2
+if $(OS) = CYGWIN
+{
+    rule BZip2
+    {
+        Depends $(<) : $(>) ;
+        Depends lib  : $(<) ;
+    }
+    actions BZip2
+    {
+        cd `dirname $(>)` && CONTRIB=`pwd` &&
+        rm -rf bzip2 && (gzip -dc bzip2.tar.gz | tar xf - ) &&
+        cd bzip2 && $(MAKE) && $(MAKE) install && cp libbz2.a $CONTRIB/lib/ &&
+        $(STRIP) $CONTRIB/lib/libbz2.a
+    }
+    Wget  $(SUBDIR)/bzip2.tar.gz : $(SUBDIR)/version_bzip2.txt ;
+    BZip2  $(SUBDIR)/lib/libbz2.a  : $(SUBDIR)/bzip2.tar.gz ;
+}