From 68e19d426ba6d9f048ebfdf337b93a85dc4d5b4c Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 29 Jun 2014 18:18:50 +0200
Subject: Update lzo version

--HG--
extra : rebase_source : 4310223035376c8ac1773fd03a43289aa96ce4f3
---
 main/lzo/B/00README.TXT       | 3 ---
 main/lzo/B/dos32/bc_pp.bat    | 2 +-
 main/lzo/B/dos32/dj2.bat      | 2 +-
 main/lzo/B/dos32/dm.bat       | 2 +-
 main/lzo/B/dos32/emx.bat      | 2 +-
 main/lzo/B/dos32/highc.bat    | 2 +-
 main/lzo/B/dos32/highc.rsp    | 6 ------
 main/lzo/B/dos32/ndp.bat      | 2 +-
 main/lzo/B/dos32/sc.bat       | 2 +-
 main/lzo/B/dos32/wc.bat       | 2 +-
 main/lzo/B/dos32/zc.bat       | 2 +-
 main/lzo/B/generic/Makefile   | 2 +-
 main/lzo/B/generic/build.sh   | 2 +-
 main/lzo/B/generic/clean.sh   | 2 +-
 main/lzo/B/os2/emx.bat        | 2 +-
 main/lzo/B/os2/wc.bat         | 2 +-
 main/lzo/B/os2/zc.bat         | 2 +-
 main/lzo/B/win32/bc.bat       | 2 +-
 main/lzo/B/win32/bc.rsp       | 8 +-------
 main/lzo/B/win32/cygwin.bat   | 2 +-
 main/lzo/B/win32/cygwin.rsp   | 6 ------
 main/lzo/B/win32/dm.bat       | 2 +-
 main/lzo/B/win32/ic.bat       | 6 +++---
 main/lzo/B/win32/lccwin32.bat | 2 +-
 main/lzo/B/win32/mingw.bat    | 2 +-
 main/lzo/B/win32/mwerks.bat   | 2 +-
 main/lzo/B/win32/pellesc.bat  | 2 +-
 main/lzo/B/win32/pgi.bat      | 2 +-
 main/lzo/B/win32/pw32.bat     | 2 +-
 main/lzo/B/win32/rsxnt.bat    | 2 +-
 main/lzo/B/win32/sc.bat       | 2 +-
 main/lzo/B/win32/vc.bat       | 4 ++--
 main/lzo/B/win32/vc.rsp       | 6 ------
 main/lzo/B/win32/vc_dll.bat   | 4 ++--
 main/lzo/B/win32/vc_dll.def   | 6 ------
 main/lzo/B/win32/wc.bat       | 2 +-
 main/lzo/B/win32/wc.rsp       | 6 ------
 main/lzo/B/win64/ic.bat       | 6 +++---
 main/lzo/B/win64/ic_dll.bat   | 4 ++--
 main/lzo/B/win64/vc.bat       | 6 +++---
 main/lzo/B/win64/vc_dll.bat   | 6 +++---
 41 files changed, 46 insertions(+), 85 deletions(-)

(limited to 'main/lzo/B')

diff --git a/main/lzo/B/00README.TXT b/main/lzo/B/00README.TXT
index 45bdf7b8..17d8ef8e 100644
--- a/main/lzo/B/00README.TXT
+++ b/main/lzo/B/00README.TXT
@@ -45,9 +45,6 @@ b\win64\ic_dll.bat          Intel C/C++ (Itanium) (DLL version)
 b\win64\vc.bat              Visual C/C++ (AMD64 or Itanium)
 b\win64\vc_dll.bat          Visual C/C++ (AMD64 or Itanium) (DLL version)
 
-Finally, there are also a number of build scripts for obsolete systems
-like dos16 and win16.
-
 
 Notes:
   (1) includes support for i386 assembler versions
diff --git a/main/lzo/B/dos32/bc_pp.bat b/main/lzo/B/dos32/bc_pp.bat
index 7cd86dd4..77063464 100644
--- a/main/lzo/B/dos32/bc_pp.bat
+++ b/main/lzo/B/dos32/bc_pp.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 //   DOS 32-bit
 @echo //   Borland C/C++ + Borland PowerPack 1.0 (DPMI32)
diff --git a/main/lzo/B/dos32/dj2.bat b/main/lzo/B/dos32/dj2.bat
index ac493992..85928d02 100644
--- a/main/lzo/B/dos32/dj2.bat
+++ b/main/lzo/B/dos32/dj2.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 //   DOS 32-bit
 @echo //   djgpp2 + gcc
diff --git a/main/lzo/B/dos32/dm.bat b/main/lzo/B/dos32/dm.bat
index 0449668c..9384bed5 100644
--- a/main/lzo/B/dos32/dm.bat
+++ b/main/lzo/B/dos32/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 //   DOS 32-bit
 @echo //   Digital Mars C/C++
diff --git a/main/lzo/B/dos32/emx.bat b/main/lzo/B/dos32/emx.bat
index ceb97e4d..04423424 100644
--- a/main/lzo/B/dos32/emx.bat
+++ b/main/lzo/B/dos32/emx.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 //   DOS 32-bit
 @echo //   emx + gcc
diff --git a/main/lzo/B/dos32/highc.bat b/main/lzo/B/dos32/highc.bat
index e3e28a7c..a9881164 100644
--- a/main/lzo/B/dos32/highc.bat
+++ b/main/lzo/B/dos32/highc.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 //   DOS 32-bit
 @echo //   MetaWare High C/C++ (using Pharlap DOS extender)
diff --git a/main/lzo/B/dos32/highc.rsp b/main/lzo/B/dos32/highc.rsp
index ef2dc7fa..d477b962 100644
--- a/main/lzo/B/dos32/highc.rsp
+++ b/main/lzo/B/dos32/highc.rsp
@@ -66,14 +66,8 @@
 -create lzo_str.obj
 -create lzo_util.obj
 -create asm\i386\obj\omf32\lzo1c_s1.obj
--create asm\i386\obj\omf32\lzo1c_s2.obj
 -create asm\i386\obj\omf32\lzo1f_f1.obj
--create asm\i386\obj\omf32\lzo1f_f2.obj
 -create asm\i386\obj\omf32\lzo1x_f1.obj
--create asm\i386\obj\omf32\lzo1x_f2.obj
 -create asm\i386\obj\omf32\lzo1x_s1.obj
--create asm\i386\obj\omf32\lzo1x_s2.obj
 -create asm\i386\obj\omf32\lzo1y_f1.obj
--create asm\i386\obj\omf32\lzo1y_f2.obj
 -create asm\i386\obj\omf32\lzo1y_s1.obj
--create asm\i386\obj\omf32\lzo1y_s2.obj
diff --git a/main/lzo/B/dos32/ndp.bat b/main/lzo/B/dos32/ndp.bat
index 64b04ed4..2b203118 100644
--- a/main/lzo/B/dos32/ndp.bat
+++ b/main/lzo/B/dos32/ndp.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 //   DOS 32-bit
 @echo //   Microway NDP C/C++
diff --git a/main/lzo/B/dos32/sc.bat b/main/lzo/B/dos32/sc.bat
index 1b233336..44fed188 100644
--- a/main/lzo/B/dos32/sc.bat
+++ b/main/lzo/B/dos32/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 //   DOS 32-bit
 @echo //   Symantec C/C++
diff --git a/main/lzo/B/dos32/wc.bat b/main/lzo/B/dos32/wc.bat
index bfa776d5..21de11dc 100644
--- a/main/lzo/B/dos32/wc.bat
+++ b/main/lzo/B/dos32/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 //   DOS 32-bit
 @echo //   Watcom C/C++ (using DOS/4G extender)
diff --git a/main/lzo/B/dos32/zc.bat b/main/lzo/B/dos32/zc.bat
index 0da77941..193502f9 100644
--- a/main/lzo/B/dos32/zc.bat
+++ b/main/lzo/B/dos32/zc.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 //   DOS 32-bit
 @echo //   Zortech C/C++
diff --git a/main/lzo/B/generic/Makefile b/main/lzo/B/generic/Makefile
index acddb04e..322ebe8a 100644
--- a/main/lzo/B/generic/Makefile
+++ b/main/lzo/B/generic/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
 #
 # this is modelled after build.sh; needs GNU make 3.80 or better
 
diff --git a/main/lzo/B/generic/build.sh b/main/lzo/B/generic/build.sh
index 1bf5585b..0480314e 100755
--- a/main/lzo/B/generic/build.sh
+++ b/main/lzo/B/generic/build.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # vi:ts=4:et
 set -e
-echo "// Copyright (C) 1996-2011 Markus F.X.J. Oberhumer"
+echo "// Copyright (C) 1996-2014 Markus F.X.J. Oberhumer"
 echo "//"
 echo "//   Generic Posix/Unix system"
 echo "//   Generic C compiler"
diff --git a/main/lzo/B/generic/clean.sh b/main/lzo/B/generic/clean.sh
index 11c23951..2728d2de 100755
--- a/main/lzo/B/generic/clean.sh
+++ b/main/lzo/B/generic/clean.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # vi:ts=4:et
-# Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
 
 rm -f *.o liblzo2.a dict.out lzopack.out precomp.out precomp2.out simple.out lzotest.out testmini.out
 
diff --git a/main/lzo/B/os2/emx.bat b/main/lzo/B/os2/emx.bat
index 01d7dfa4..2367d65c 100644
--- a/main/lzo/B/os2/emx.bat
+++ b/main/lzo/B/os2/emx.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 //   OS/2 32-bit
 @echo //   emx + gcc
diff --git a/main/lzo/B/os2/wc.bat b/main/lzo/B/os2/wc.bat
index 79e2082b..44b43f50 100644
--- a/main/lzo/B/os2/wc.bat
+++ b/main/lzo/B/os2/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 //   OS/2 32-bit
 @echo //   Watcom C/C++
diff --git a/main/lzo/B/os2/zc.bat b/main/lzo/B/os2/zc.bat
index 47a6d51b..5e4e7f68 100644
--- a/main/lzo/B/os2/zc.bat
+++ b/main/lzo/B/os2/zc.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 //   OS/2 32-bit
 @echo //   Zortech C/C++
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'
diff --git a/main/lzo/B/win64/ic.bat b/main/lzo/B/win64/ic.bat
index c5d367a9..154d5e4d 100644
--- a/main/lzo/B/win64/ic.bat
+++ b/main/lzo/B/win64/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 64-bit (Itanium)
 @echo //   Intel C/C++
@@ -7,8 +7,8 @@
 @if "%BECHO%"=="n" echo off
 
 
-set CC=icl -nologo -MD
-set CF=-O2 -GF -W3 %CFI%
+set CC=icl -nologo -MT
+set CF=-O2 -GF -W3 -Qvec-report0 %CFI%
 set LF=%BLIB%
 
 %CC% %CF% -c @b\src.rsp
diff --git a/main/lzo/B/win64/ic_dll.bat b/main/lzo/B/win64/ic_dll.bat
index 6e5b7df7..620fadcc 100644
--- a/main/lzo/B/win64/ic_dll.bat
+++ b/main/lzo/B/win64/ic_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 64-bit (Itanium)
 @echo //   Intel C/C++ (DLL)
@@ -7,7 +7,7 @@
 @if "%BECHO%"=="n" echo off
 
 
-set CC=icl -nologo -MD
+set CC=icl -nologo -MT
 set CF=-O2 -GF -W3 %CFI%
 set LF=%BLIB%
 
diff --git a/main/lzo/B/win64/vc.bat b/main/lzo/B/win64/vc.bat
index 67245460..1aada926 100644
--- a/main/lzo/B/win64/vc.bat
+++ b/main/lzo/B/win64/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 64-bit (AMD64 or Itanium)
 @echo //   Microsoft Visual C/C++
@@ -7,8 +7,8 @@
 @if "%BECHO%"=="n" echo off
 
 
-set CC=cl -nologo -MD
-set CF=-O2 -GF -W3 -Wp64 %CFI%
+set CC=cl -nologo -MT
+set CF=-O2 -GF -W3 %CFI%
 set LF=%BLIB%
 
 %CC% %CF% -c @b\src.rsp
diff --git a/main/lzo/B/win64/vc_dll.bat b/main/lzo/B/win64/vc_dll.bat
index 73bf6d3f..63ea5fc8 100644
--- a/main/lzo/B/win64/vc_dll.bat
+++ b/main/lzo/B/win64/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 64-bit (AMD64 or Itanium)
 @echo //   Microsoft Visual C/C++ (DLL)
@@ -7,8 +7,8 @@
 @if "%BECHO%"=="n" echo off
 
 
-set CC=cl -nologo -MD
-set CF=-O2 -GF -W3 -Wp64 %CFI%
+set CC=cl -nologo -MT
+set CF=-O2 -GF -W3 %CFI%
 set LF=%BLIB%
 
 %CC% %CF% -D__LZO_EXPORT1#__declspec(dllexport) -c @b\src.rsp
-- 
cgit v1.2.3