Merge branch 'develop'

6 files changed, 236 insertions, 236 deletions

diff --git a/app/lzo/B/win64/ic.bat b/app/lzo/B/win64/ic.bat
index c5d367a9..cdc9762f 100644
--- a/app/lzo/B/win64/ic.bat
+++ b/app/lzo/B/win64/ic.bat
@@ -1,42 +1,42 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 64-bit (Itanium)

-@echo //   Intel C/C++

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=icl -nologo -MD

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

-set LF=%BLIB%

-

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

-@if errorlevel 1 goto error

-link -lib -nologo -out:%BLIB% @b\win64\vc.rsp

-@if errorlevel 1 goto error

-

-%CC% %CF% examples\dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% lzotest\lzotest.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 64-bit (Itanium)
+@echo //   Intel C/C++
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=icl -nologo -MT
+set CF=-O2 -GF -W3 -Qvec-report0 %CFI%
+set LF=%BLIB%
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+link -lib -nologo -out:%BLIB% @b\win64\vc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win64/ic_dll.bat b/app/lzo/B/win64/ic_dll.bat
index 6e5b7df7..ec806084 100644
--- a/app/lzo/B/win64/ic_dll.bat
+++ b/app/lzo/B/win64/ic_dll.bat
@@ -1,42 +1,42 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 64-bit (Itanium)

-@echo //   Intel C/C++ (DLL)

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=icl -nologo -MD

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

-set LF=%BLIB%

-

-%CC% %CF% -D__LZO_EXPORT1#__declspec(dllexport) -c @b\src.rsp

-@if errorlevel 1 goto error

-%CC% -LD -Fe%BDLL% @b\win64\vc.rsp /link /map /def:b\win64\vc_dll.def

-@if errorlevel 1 goto error

-

-%CC% %CF% examples\dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% lzotest\lzotest.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 64-bit (Itanium)
+@echo //   Intel C/C++ (DLL)
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=icl -nologo -MT
+set CF=-O2 -GF -W3 %CFI%
+set LF=%BLIB%
+
+%CC% %CF% -D__LZO_EXPORT1#__declspec(dllexport) -c @b\src.rsp
+@if errorlevel 1 goto error
+%CC% -LD -Fe%BDLL% @b\win64\vc.rsp /link /map /def:b\win64\vc_dll.def
+@if errorlevel 1 goto error
+
+%CC% %CF% examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win64/vc.bat b/app/lzo/B/win64/vc.bat
index 67245460..03694ca9 100644
--- a/app/lzo/B/win64/vc.bat
+++ b/app/lzo/B/win64/vc.bat
@@ -1,42 +1,42 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 64-bit (AMD64 or Itanium)

-@echo //   Microsoft Visual C/C++

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=cl -nologo -MD

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

-set LF=%BLIB%

-

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

-@if errorlevel 1 goto error

-link -lib -nologo -out:%BLIB% @b\win64\vc.rsp

-@if errorlevel 1 goto error

-

-%CC% %CF% examples\dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% lzotest\lzotest.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 64-bit (AMD64 or Itanium)
+@echo //   Microsoft Visual C/C++
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=cl -nologo -MT
+set CF=-O2 -GF -W3 %CFI%
+set LF=%BLIB%
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+link -lib -nologo -out:%BLIB% @b\win64\vc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win64/vc.rsp b/app/lzo/B/win64/vc.rsp
index 182de60c..da684c94 100644
--- a/app/lzo/B/win64/vc.rsp
+++ b/app/lzo/B/win64/vc.rsp
@@ -1,67 +1,67 @@
-.\lzo1.obj

-.\lzo1_99.obj

-.\lzo1a.obj

-.\lzo1a_99.obj

-.\lzo1b_1.obj

-.\lzo1b_2.obj

-.\lzo1b_3.obj

-.\lzo1b_4.obj

-.\lzo1b_5.obj

-.\lzo1b_6.obj

-.\lzo1b_7.obj

-.\lzo1b_8.obj

-.\lzo1b_9.obj

-.\lzo1b_99.obj

-.\lzo1b_9x.obj

-.\lzo1b_cc.obj

-.\lzo1b_d1.obj

-.\lzo1b_d2.obj

-.\lzo1b_rr.obj

-.\lzo1b_xx.obj

-.\lzo1c_1.obj

-.\lzo1c_2.obj

-.\lzo1c_3.obj

-.\lzo1c_4.obj

-.\lzo1c_5.obj

-.\lzo1c_6.obj

-.\lzo1c_7.obj

-.\lzo1c_8.obj

-.\lzo1c_9.obj

-.\lzo1c_99.obj

-.\lzo1c_9x.obj

-.\lzo1c_cc.obj

-.\lzo1c_d1.obj

-.\lzo1c_d2.obj

-.\lzo1c_rr.obj

-.\lzo1c_xx.obj

-.\lzo1f_1.obj

-.\lzo1f_9x.obj

-.\lzo1f_d1.obj

-.\lzo1f_d2.obj

-.\lzo1x_1.obj

-.\lzo1x_1k.obj

-.\lzo1x_1l.obj

-.\lzo1x_1o.obj

-.\lzo1x_9x.obj

-.\lzo1x_d1.obj

-.\lzo1x_d2.obj

-.\lzo1x_d3.obj

-.\lzo1x_o.obj

-.\lzo1y_1.obj

-.\lzo1y_9x.obj

-.\lzo1y_d1.obj

-.\lzo1y_d2.obj

-.\lzo1y_d3.obj

-.\lzo1y_o.obj

-.\lzo1z_9x.obj

-.\lzo1z_d1.obj

-.\lzo1z_d2.obj

-.\lzo1z_d3.obj

-.\lzo2a_9x.obj

-.\lzo2a_d1.obj

-.\lzo2a_d2.obj

-.\lzo_crc.obj

-.\lzo_init.obj

-.\lzo_ptr.obj

-.\lzo_str.obj

-.\lzo_util.obj

+.\lzo1.obj
+.\lzo1_99.obj
+.\lzo1a.obj
+.\lzo1a_99.obj
+.\lzo1b_1.obj
+.\lzo1b_2.obj
+.\lzo1b_3.obj
+.\lzo1b_4.obj
+.\lzo1b_5.obj
+.\lzo1b_6.obj
+.\lzo1b_7.obj
+.\lzo1b_8.obj
+.\lzo1b_9.obj
+.\lzo1b_99.obj
+.\lzo1b_9x.obj
+.\lzo1b_cc.obj
+.\lzo1b_d1.obj
+.\lzo1b_d2.obj
+.\lzo1b_rr.obj
+.\lzo1b_xx.obj
+.\lzo1c_1.obj
+.\lzo1c_2.obj
+.\lzo1c_3.obj
+.\lzo1c_4.obj
+.\lzo1c_5.obj
+.\lzo1c_6.obj
+.\lzo1c_7.obj
+.\lzo1c_8.obj
+.\lzo1c_9.obj
+.\lzo1c_99.obj
+.\lzo1c_9x.obj
+.\lzo1c_cc.obj
+.\lzo1c_d1.obj
+.\lzo1c_d2.obj
+.\lzo1c_rr.obj
+.\lzo1c_xx.obj
+.\lzo1f_1.obj
+.\lzo1f_9x.obj
+.\lzo1f_d1.obj
+.\lzo1f_d2.obj
+.\lzo1x_1.obj
+.\lzo1x_1k.obj
+.\lzo1x_1l.obj
+.\lzo1x_1o.obj
+.\lzo1x_9x.obj
+.\lzo1x_d1.obj
+.\lzo1x_d2.obj
+.\lzo1x_d3.obj
+.\lzo1x_o.obj
+.\lzo1y_1.obj
+.\lzo1y_9x.obj
+.\lzo1y_d1.obj
+.\lzo1y_d2.obj
+.\lzo1y_d3.obj
+.\lzo1y_o.obj
+.\lzo1z_9x.obj
+.\lzo1z_d1.obj
+.\lzo1z_d2.obj
+.\lzo1z_d3.obj
+.\lzo2a_9x.obj
+.\lzo2a_d1.obj
+.\lzo2a_d2.obj
+.\lzo_crc.obj
+.\lzo_init.obj
+.\lzo_ptr.obj
+.\lzo_str.obj
+.\lzo_util.obj
diff --git a/app/lzo/B/win64/vc_dll.bat b/app/lzo/B/win64/vc_dll.bat
index 73bf6d3f..f21361a7 100644
--- a/app/lzo/B/win64/vc_dll.bat
+++ b/app/lzo/B/win64/vc_dll.bat
@@ -1,42 +1,42 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 64-bit (AMD64 or Itanium)

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

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=cl -nologo -MD

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

-set LF=%BLIB%

-

-%CC% %CF% -D__LZO_EXPORT1#__declspec(dllexport) -c @b\src.rsp

-@if errorlevel 1 goto error

-%CC% -LD -Fe%BDLL% @b\win64\vc.rsp /link /map /def:b\win64\vc_dll.def

-@if errorlevel 1 goto error

-

-%CC% %CF% examples\dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% lzotest\lzotest.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 64-bit (AMD64 or Itanium)
+@echo //   Microsoft Visual C/C++ (DLL)
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+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
+@if errorlevel 1 goto error
+%CC% -LD -Fe%BDLL% @b\win64\vc.rsp /link /map /def:b\win64\vc_dll.def
+@if errorlevel 1 goto error
+
+%CC% %CF% examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win64/vc_dll.def b/app/lzo/B/win64/vc_dll.def
index e80a637a..aabd2247 100644
--- a/app/lzo/B/win64/vc_dll.def
+++ b/app/lzo/B/win64/vc_dll.def
@@ -1 +1 @@
-EXPORTS

+EXPORTS