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 1abb22fbbcb65067c4f5549a42c588a1904fb549..ac3e7948455256f7a03ca951e4266dcf283a5042 100644 (file)
--- 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 9bd41485bb4ed71420f4f64e4279e8dcfebe23bb..ecfe38299aec785554f22665b20befb55efb4df3 100644 (file)
--- 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 (file)
index 0000000..7a90c84
--- /dev/null
+++ b/contrib/version_bzip2.txt
@@ -0,0 +1 @@
+http://download.m0k.org/handbrake/contrib/bzip2-1.0.5.tar.gz