From: sr55 <sr55.hb@outlook.com>
Date: Sun, 21 Sep 2008 19:16:40 +0000 (+0000)
Subject: Cygwin:
X-Git-Tag: 0.9.3~204
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41d09f012cff42a24eed2a72941fbba167f98924;p=handbrake

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
---

diff --git a/Jamfile b/Jamfile
index 1abb22fbb..ac3e79484 100644
--- a/Jamfile
+++ b/Jamfile
@@ -24,6 +24,11 @@ if $(OS) = UNKNOWN
     OS = CYGWIN ;
 }
 
+if $(OS) = CYGWIN
+{
+    HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libbz2.a contrib/lib/libz.a ;
+}
+
 if $(CSS) = 1
 {
     HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
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 ;
+}
diff --git a/contrib/version_bzip2.txt b/contrib/version_bzip2.txt
new file mode 100644
index 000000000..7a90c8411
--- /dev/null
+++ b/contrib/version_bzip2.txt
@@ -0,0 +1 @@
+http://download.m0k.org/handbrake/contrib/bzip2-1.0.5.tar.gz