files/unalz-0.62.patch

unalz-0.62.patch (text/plain), 2.37 KB, created by Anton Romanov on 2009-01-24 11:29:58 UTC

Только в unalz.new/: 1.log
Общие подкаталоги: unalz/bzip2 и unalz.new/bzip2
diff -u unalz/Makefile unalz.new/Makefile
--- unalz/Makefile	2006-04-23 08:01:27.000000000 +0300
+++ unalz.new/Makefile	2009-01-24 13:25:48.000000000 +0200
@@ -1,9 +1,9 @@
-CPP = g++
-CC  = gcc
-OBJ = main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
+#CPP = g++
+#CC  = gcc
+OBJ = main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o
 BIN = unalz
-LDFLAGS = 
-CFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
+LDFLAGS += -lz -lbz2
+CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
 
 all:
 	@echo ""
@@ -34,8 +34,8 @@
 	$(CPP) $(OBJ) $(LDFLAGS) -o $(BIN)
 
 linux-utf8: unalz
-	$(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS)
-	$(CPP) $(OBJ) $(LDFLAGS) -o $(BIN)
+	$(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS)
+	$(CXX) $(OBJ) $(LDFLAGS) -o $(BIN)
 
 install:
 	cp unalz /usr/local/bin/
Только в unalz.new/: Makefile.new
diff -u unalz/UnAlzBzip2.cpp unalz.new/UnAlzBzip2.cpp
--- unalz/UnAlzBzip2.cpp	2007-04-12 15:04:56.000000000 +0300
+++ unalz.new/UnAlzBzip2.cpp	2009-01-24 13:20:38.000000000 +0200
@@ -10,11 +10,20 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 //#include "stdafx.h"
-#include "zlib/zlib.h"
-#include "bzip2/bzlib.h"
-#include "bzip2/bzlib_private.h"
+#include <zlib.h>
+#include <bzlib.h>
+//#include "bzip2/bzlib_private.h"
 #include "UnAlz.h"
 
+typedef char            Char;
+typedef unsigned char   Bool;
+typedef unsigned char   UChar;
+typedef int             Int32;
+typedef unsigned int    UInt32;
+typedef short           Int16;
+typedef unsigned short  UInt16;
+#define True  ((Bool)1)
+#define False ((Bool)0)
 
 typedef struct {
   CUnAlz*    handle;
diff -u unalz/UnAlz.cpp unalz.new/UnAlz.cpp
--- unalz/UnAlz.cpp	2008-04-04 03:17:20.000000000 +0300
+++ unalz.new/UnAlz.cpp	2009-01-24 13:12:57.000000000 +0200
@@ -1,4 +1,4 @@
-#include "bzip2/bzlib.h"
+#include <bzlib.h>
 #include "UnAlz.h"
 
 #ifdef _WIN32
Общие подкаталоги: unalz/zlib и unalz.new/zlib