Update lzo version

--HG--
extra : rebase_source : 4310223035376c8ac1773fd03a43289aa96ce4f3

20 files changed, 20 insertions, 50 deletions

diff --git a/main/lzo/B/win32/bc.bat b/main/lzo/B/win32/bc.bat
index 2aa9028c..811acdbb 100644
--- a/main/lzo/B/win32/bc.bat
+++ b/main/lzo/B/win32/bc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Borland C/C++

diff --git a/main/lzo/B/win32/bc.rsp b/main/lzo/B/win32/bc.rsp
index 477f1ffd..b48a182d 100644
--- a/main/lzo/B/win32/bc.rsp
+++ b/main/lzo/B/win32/bc.rsp
@@ -66,14 +66,8 @@
 +lzo_str.obj &

 +lzo_util.obj &

 +asm\i386\obj\omf32\lzo1c_s1.obj &

-+asm\i386\obj\omf32\lzo1c_s2.obj &

 +asm\i386\obj\omf32\lzo1f_f1.obj &

-+asm\i386\obj\omf32\lzo1f_f2.obj &

 +asm\i386\obj\omf32\lzo1x_f1.obj &

-+asm\i386\obj\omf32\lzo1x_f2.obj &

 +asm\i386\obj\omf32\lzo1x_s1.obj &

-+asm\i386\obj\omf32\lzo1x_s2.obj &

 +asm\i386\obj\omf32\lzo1y_f1.obj &

-+asm\i386\obj\omf32\lzo1y_f2.obj &

-+asm\i386\obj\omf32\lzo1y_s1.obj &

-+asm\i386\obj\omf32\lzo1y_s2.obj

++asm\i386\obj\omf32\lzo1y_s1.obj

diff --git a/main/lzo/B/win32/cygwin.bat b/main/lzo/B/win32/cygwin.bat
index 661badba..57533e0e 100644
--- a/main/lzo/B/win32/cygwin.bat
+++ b/main/lzo/B/win32/cygwin.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   cygwin + gcc

diff --git a/main/lzo/B/win32/cygwin.rsp b/main/lzo/B/win32/cygwin.rsp
index 2c9c9f99..62eab38c 100644
--- a/main/lzo/B/win32/cygwin.rsp
+++ b/main/lzo/B/win32/cygwin.rsp
@@ -66,14 +66,8 @@ lzo_ptr.o
 lzo_str.o

 lzo_util.o

 lzo1c_s1.o

-lzo1c_s2.o

 lzo1f_f1.o

-lzo1f_f2.o

 lzo1x_f1.o

-lzo1x_f2.o

 lzo1x_s1.o

-lzo1x_s2.o

 lzo1y_f1.o

-lzo1y_f2.o

 lzo1y_s1.o

-lzo1y_s2.o

diff --git a/main/lzo/B/win32/dm.bat b/main/lzo/B/win32/dm.bat
index c06498d7..5c65dfe4 100644
--- a/main/lzo/B/win32/dm.bat
+++ b/main/lzo/B/win32/dm.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Digital Mars C/C++

diff --git a/main/lzo/B/win32/ic.bat b/main/lzo/B/win32/ic.bat
index 807e33d9..f9f6f5a5 100644
--- a/main/lzo/B/win32/ic.bat
+++ b/main/lzo/B/win32/ic.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Intel C/C++

@@ -7,8 +7,8 @@
 @if "%BECHO%"=="n" echo off

 

 

-set CC=icl -nologo -MD

-set CF=-O2 -GF -W3 %CFI% %CFASM%

+set CC=icl -nologo -MT

+set CF=-O2 -GF -W3 -Qvec-report0 %CFI% %CFASM%

 set LF=%BLIB%

 

 %CC% %CF% -c @b\src.rsp

diff --git a/main/lzo/B/win32/lccwin32.bat b/main/lzo/B/win32/lccwin32.bat
index e9a1c5f9..e01ee98a 100644
--- a/main/lzo/B/win32/lccwin32.bat
+++ b/main/lzo/B/win32/lccwin32.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   lcc-win32

diff --git a/main/lzo/B/win32/mingw.bat b/main/lzo/B/win32/mingw.bat
index 1a747bbd..81830ae6 100644
--- a/main/lzo/B/win32/mingw.bat
+++ b/main/lzo/B/win32/mingw.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   MinGW + gcc

diff --git a/main/lzo/B/win32/mwerks.bat b/main/lzo/B/win32/mwerks.bat
index 99395cc0..8aad1488 100644
--- a/main/lzo/B/win32/mwerks.bat
+++ b/main/lzo/B/win32/mwerks.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Metrowerks CodeWarrior C/C++

diff --git a/main/lzo/B/win32/pellesc.bat b/main/lzo/B/win32/pellesc.bat
index 4c9569f1..7123f1b1 100644
--- a/main/lzo/B/win32/pellesc.bat
+++ b/main/lzo/B/win32/pellesc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Pelles C

diff --git a/main/lzo/B/win32/pgi.bat b/main/lzo/B/win32/pgi.bat
index 73be86ed..82e17727 100644
--- a/main/lzo/B/win32/pgi.bat
+++ b/main/lzo/B/win32/pgi.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Portland Group PGI C/C++

diff --git a/main/lzo/B/win32/pw32.bat b/main/lzo/B/win32/pw32.bat
index b863dd0a..583ca493 100644
--- a/main/lzo/B/win32/pw32.bat
+++ b/main/lzo/B/win32/pw32.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   PW32 + gcc

diff --git a/main/lzo/B/win32/rsxnt.bat b/main/lzo/B/win32/rsxnt.bat
index 8f7b5795..3077f6f4 100644
--- a/main/lzo/B/win32/rsxnt.bat
+++ b/main/lzo/B/win32/rsxnt.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   rsxnt + gcc

diff --git a/main/lzo/B/win32/sc.bat b/main/lzo/B/win32/sc.bat
index 83a4e565..b1f5c463 100644
--- a/main/lzo/B/win32/sc.bat
+++ b/main/lzo/B/win32/sc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Symantec C/C++

diff --git a/main/lzo/B/win32/vc.bat b/main/lzo/B/win32/vc.bat
index 5a8a394b..0b7d1f65 100644
--- a/main/lzo/B/win32/vc.bat
+++ b/main/lzo/B/win32/vc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Microsoft Visual C/C++

@@ -7,7 +7,7 @@
 @if "%BECHO%"=="n" echo off

 

 

-set CC=cl -nologo -MD

+set CC=cl -nologo -MT

 set CF=-O2 -GF -W3 %CFI% %CFASM%

 set LF=%BLIB%

 

diff --git a/main/lzo/B/win32/vc.rsp b/main/lzo/B/win32/vc.rsp
index 6c5ca7ea..690bec1c 100644
--- a/main/lzo/B/win32/vc.rsp
+++ b/main/lzo/B/win32/vc.rsp
@@ -66,14 +66,8 @@
 .\lzo_str.obj

 .\lzo_util.obj

 .\asm\i386\obj\win32\lzo1c_s1.obj

-.\asm\i386\obj\win32\lzo1c_s2.obj

 .\asm\i386\obj\win32\lzo1f_f1.obj

-.\asm\i386\obj\win32\lzo1f_f2.obj

 .\asm\i386\obj\win32\lzo1x_f1.obj

-.\asm\i386\obj\win32\lzo1x_f2.obj

 .\asm\i386\obj\win32\lzo1x_s1.obj

-.\asm\i386\obj\win32\lzo1x_s2.obj

 .\asm\i386\obj\win32\lzo1y_f1.obj

-.\asm\i386\obj\win32\lzo1y_f2.obj

 .\asm\i386\obj\win32\lzo1y_s1.obj

-.\asm\i386\obj\win32\lzo1y_s2.obj

diff --git a/main/lzo/B/win32/vc_dll.bat b/main/lzo/B/win32/vc_dll.bat
index f6aa14c0..72788c0a 100644
--- a/main/lzo/B/win32/vc_dll.bat
+++ b/main/lzo/B/win32/vc_dll.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Microsoft Visual C/C++ (DLL)

@@ -7,7 +7,7 @@
 @if "%BECHO%"=="n" echo off

 

 

-set CC=cl -nologo -MD

+set CC=cl -nologo -MT

 set CF=-O2 -GF -W3 %CFI% %CFASM%

 set LF=%BLIB%

 

diff --git a/main/lzo/B/win32/vc_dll.def b/main/lzo/B/win32/vc_dll.def
index cade569c..215fb86d 100644
--- a/main/lzo/B/win32/vc_dll.def
+++ b/main/lzo/B/win32/vc_dll.def
@@ -1,13 +1,7 @@
 EXPORTS

  _lzo1c_decompress_asm=lzo1c_decompress_asm

- _lzo1c_decompress_asm_safe=lzo1c_decompress_asm_safe

  _lzo1f_decompress_asm_fast=lzo1f_decompress_asm_fast

- _lzo1f_decompress_asm_fast_safe=lzo1f_decompress_asm_fast_safe

  _lzo1x_decompress_asm=lzo1x_decompress_asm

  _lzo1x_decompress_asm_fast=lzo1x_decompress_asm_fast

- _lzo1x_decompress_asm_fast_safe=lzo1x_decompress_asm_fast_safe

- _lzo1x_decompress_asm_safe=lzo1x_decompress_asm_safe

  _lzo1y_decompress_asm=lzo1y_decompress_asm

  _lzo1y_decompress_asm_fast=lzo1y_decompress_asm_fast

- _lzo1y_decompress_asm_fast_safe=lzo1y_decompress_asm_fast_safe

- _lzo1y_decompress_asm_safe=lzo1y_decompress_asm_safe

diff --git a/main/lzo/B/win32/wc.bat b/main/lzo/B/win32/wc.bat
index ffdbe636..64e34a23 100644
--- a/main/lzo/B/win32/wc.bat
+++ b/main/lzo/B/win32/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Watcom C/C++

diff --git a/main/lzo/B/win32/wc.rsp b/main/lzo/B/win32/wc.rsp
index 5bf8b8c1..503667ba 100644
--- a/main/lzo/B/win32/wc.rsp
+++ b/main/lzo/B/win32/wc.rsp
@@ -66,14 +66,8 @@
 +'lzo_str.obj'

 +'lzo_util.obj'

 +'asm\i386\obj\omf32\lzo1c_s1.obj'

-+'asm\i386\obj\omf32\lzo1c_s2.obj'

 +'asm\i386\obj\omf32\lzo1f_f1.obj'

-+'asm\i386\obj\omf32\lzo1f_f2.obj'

 +'asm\i386\obj\omf32\lzo1x_f1.obj'

-+'asm\i386\obj\omf32\lzo1x_f2.obj'

 +'asm\i386\obj\omf32\lzo1x_s1.obj'

-+'asm\i386\obj\omf32\lzo1x_s2.obj'

 +'asm\i386\obj\omf32\lzo1y_f1.obj'

-+'asm\i386\obj\omf32\lzo1y_f2.obj'

 +'asm\i386\obj\omf32\lzo1y_s1.obj'

-+'asm\i386\obj\omf32\lzo1y_s2.obj'