mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 14:29:53 +02:00
StreamUtils.o to Makefile, fix build error
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3477 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
wbx
parent
ff535d7f58
commit
6bc4446773
@ -1,6 +1,6 @@
|
|||||||
diff -urN lzma432/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp
|
diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp
|
||||||
--- lzma432/C/7zip/Compress/LZMA/LZMADecoder.cpp 2005-09-22 12:55:34.000000000 +0400
|
--- lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp 2005-09-22 10:55:34.000000000 +0200
|
||||||
+++ lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp 2006-03-24 13:23:09.634551840 +0300
|
+++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp 2006-03-25 11:04:53.000000000 +0100
|
||||||
@@ -274,12 +274,17 @@
|
@@ -274,12 +274,17 @@
|
||||||
Byte remainder = (Byte)(properties[0] / 9);
|
Byte remainder = (Byte)(properties[0] / 9);
|
||||||
int lp = remainder % 5;
|
int lp = remainder % 5;
|
||||||
@ -22,9 +22,9 @@ diff -urN lzma432/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma/C/7zip/Compress/LZMA
|
|||||||
if (!_outWindowStream.Create(dictionarySize))
|
if (!_outWindowStream.Create(dictionarySize))
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
if (!_literalDecoder.Create(lp, lc))
|
if (!_literalDecoder.Create(lp, lc))
|
||||||
diff -urN lzma432/C/7zip/Compress/LZMA/LZMADecoder.h lzma/C/7zip/Compress/LZMA/LZMADecoder.h
|
diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.h lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h
|
||||||
--- lzma432/C/7zip/Compress/LZMA/LZMADecoder.h 2005-09-19 10:10:06.000000000 +0400
|
--- lzma/C/7zip/Compress/LZMA/LZMADecoder.h 2005-09-19 08:10:06.000000000 +0200
|
||||||
+++ lzma/C/7zip/Compress/LZMA/LZMADecoder.h 2006-03-24 13:23:09.635551552 +0300
|
+++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h 2006-03-25 11:04:53.000000000 +0100
|
||||||
@@ -228,6 +228,7 @@
|
@@ -228,6 +228,7 @@
|
||||||
ICompressProgressInfo *progress);
|
ICompressProgressInfo *progress);
|
||||||
|
|
||||||
@ -33,101 +33,105 @@ diff -urN lzma432/C/7zip/Compress/LZMA/LZMADecoder.h lzma/C/7zip/Compress/LZMA/L
|
|||||||
|
|
||||||
STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
|
STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
|
||||||
|
|
||||||
diff -urN lzma432/C/7zip/Compress/LZMA_Lib/makefile lzma/C/7zip/Compress/LZMA_Lib/makefile
|
diff -Nur lzma/C/7zip/Compress/LZMA_Lib/makefile lzma.patched/C/7zip/Compress/LZMA_Lib/makefile
|
||||||
--- lzma432/C/7zip/Compress/LZMA_Lib/makefile 1970-01-01 03:00:00.000000000 +0300
|
--- lzma/C/7zip/Compress/LZMA_Lib/makefile 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ lzma/C/7zip/Compress/LZMA_Lib/makefile 2006-03-24 13:26:58.254841791 +0300
|
+++ lzma.patched/C/7zip/Compress/LZMA_Lib/makefile 2006-03-25 11:29:46.000000000 +0100
|
||||||
@@ -0,0 +1,88 @@
|
@@ -0,0 +1,92 @@
|
||||||
+PROG = liblzma.a
|
+PROG = liblzma.a
|
||||||
+CXX = g++ -O3 -Wall
|
+CXX = g++ -O3 -Wall
|
||||||
+AR = ar
|
+AR = ar
|
||||||
+RM = rm -f
|
+RM = rm -f
|
||||||
+CFLAGS = -c -I ../../../
|
+CFLAGS = -c -I ../../../
|
||||||
+
|
+
|
||||||
+OBJS = \
|
+OBJS = \
|
||||||
+ ZLib.o \
|
+ ZLib.o \
|
||||||
+ LZMADecoder.o \
|
+ LZMADecoder.o \
|
||||||
+ LZMAEncoder.o \
|
+ LZMAEncoder.o \
|
||||||
+ LZInWindow.o \
|
+ LZInWindow.o \
|
||||||
+ LZOutWindow.o \
|
+ LZOutWindow.o \
|
||||||
+ RangeCoderBit.o \
|
+ RangeCoderBit.o \
|
||||||
+ InBuffer.o \
|
+ InBuffer.o \
|
||||||
+ OutBuffer.o \
|
+ OutBuffer.o \
|
||||||
+ FileStreams.o \
|
+ FileStreams.o \
|
||||||
+ Alloc.o \
|
+ Alloc.o \
|
||||||
+ C_FileIO.o \
|
+ C_FileIO.o \
|
||||||
+ CommandLineParser.o \
|
+ CommandLineParser.o \
|
||||||
+ CRC.o \
|
+ CRC.o \
|
||||||
+ String.o \
|
+ StreamUtils.o \
|
||||||
+ StringConvert.o \
|
+ String.o \
|
||||||
+ StringToInt.o \
|
+ StringConvert.o \
|
||||||
+ Vector.o \
|
+ StringToInt.o \
|
||||||
+
|
+ Vector.o \
|
||||||
+
|
+
|
||||||
+all: $(PROG)
|
+
|
||||||
+
|
+all: $(PROG)
|
||||||
+$(PROG): $(OBJS)
|
+
|
||||||
+ $(AR) r $(PROG) $(OBJS)
|
+$(PROG): $(OBJS)
|
||||||
+
|
+ $(AR) r $(PROG) $(OBJS)
|
||||||
+ZLib.o: ZLib.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ZLib.cpp
|
+ZLib.o: ZLib.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ZLib.cpp
|
||||||
+LZMADecoder.o: ../LZMA/LZMADecoder.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
|
+LZMADecoder.o: ../LZMA/LZMADecoder.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
|
||||||
+LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
|
+LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
|
||||||
+LZInWindow.o: ../LZ/LZInWindow.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp
|
+LZInWindow.o: ../LZ/LZInWindow.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp
|
||||||
+LZOutWindow.o: ../LZ/LZOutWindow.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp
|
+LZOutWindow.o: ../LZ/LZOutWindow.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp
|
||||||
+RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp
|
+RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp
|
||||||
+InBuffer.o: ../../Common/InBuffer.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
|
+InBuffer.o: ../../Common/InBuffer.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
|
||||||
+OutBuffer.o: ../../Common/OutBuffer.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp
|
+OutBuffer.o: ../../Common/OutBuffer.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp
|
||||||
+FileStreams.o: ../../Common/FileStreams.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp
|
+StreamUtils.o: ../../Common/StreamUtils.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
|
||||||
+Alloc.o: ../../../Common/Alloc.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp
|
+FileStreams.o: ../../Common/FileStreams.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp
|
||||||
+C_FileIO.o: ../../../Common/C_FileIO.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
|
+Alloc.o: ../../../Common/Alloc.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp
|
||||||
+CommandLineParser.o: ../../../Common/CommandLineParser.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
|
+C_FileIO.o: ../../../Common/C_FileIO.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
|
||||||
+CRC.o: ../../../Common/CRC.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp
|
+CommandLineParser.o: ../../../Common/CommandLineParser.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
|
||||||
+MyWindows.o: ../../../Common/MyWindows.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
|
+CRC.o: ../../../Common/CRC.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp
|
||||||
+String.o: ../../../Common/String.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/String.cpp
|
+MyWindows.o: ../../../Common/MyWindows.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
|
||||||
+StringConvert.o: ../../../Common/StringConvert.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
|
+String.o: ../../../Common/String.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/String.cpp
|
||||||
+StringToInt.o: ../../../Common/StringToInt.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
|
+StringConvert.o: ../../../Common/StringConvert.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
|
||||||
+Vector.o: ../../../Common/Vector.cpp
|
+
|
||||||
+ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp
|
+StringToInt.o: ../../../Common/StringToInt.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
|
||||||
+clean:
|
+
|
||||||
+ -$(RM) $(PROG) $(OBJS)
|
+Vector.o: ../../../Common/Vector.cpp
|
||||||
+
|
+ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp
|
||||||
diff -urN lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp
|
+
|
||||||
--- lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp 1970-01-01 03:00:00.000000000 +0300
|
+clean:
|
||||||
+++ lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp 2006-03-24 13:23:09.638550690 +0300
|
+ -$(RM) $(PROG) $(OBJS)
|
||||||
|
+
|
||||||
|
diff -Nur lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp
|
||||||
|
--- lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp 2006-03-25 11:04:53.000000000 +0100
|
||||||
@@ -0,0 +1,273 @@
|
@@ -0,0 +1,273 @@
|
||||||
+/*
|
+/*
|
||||||
+ * lzma zlib simplified wrapper
|
+ * lzma zlib simplified wrapper
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user