Merge branch 'bug/There-are-two-different-notifications-#5794' into develop

12 files changed, 541 insertions, 547 deletions

diff --git a/app/lzo/B/dos32/bc_pp.bat b/app/lzo/B/dos32/bc_pp.bat
index 7cd86dd4..dbaf460c 100644
--- a/app/lzo/B/dos32/bc_pp.bat
+++ b/app/lzo/B/dos32/bc_pp.bat
@@ -1,42 +1,42 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   DOS 32-bit

-@echo //   Borland C/C++ + Borland PowerPack 1.0 (DPMI32)

-@echo //

-@call b\prepare.bat

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

-

-

-set CC=bcc32 -WX

-set CF=-O2 -w -w-aus %CFI% -Iinclude\lzo %CFASM%

-set LF=%BLIB%

-

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

-@if errorlevel 1 goto error

-tlib %BLIB% @b\win32\bc.rsp

-@if errorlevel 1 goto error

-

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

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-

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

-@if errorlevel 1 goto error

-

-%CC% %CF% -ls -Iminilzo 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 //   DOS 32-bit
+@echo //   Borland C/C++ + Borland PowerPack 1.0 (DPMI32)
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=bcc32 -WX
+set CF=-O2 -w -w-aus %CFI% -Iinclude\lzo %CFASM%
+set LF=%BLIB%
+
+%CC% %CF% -Isrc -c @b\src.rsp
+@if errorlevel 1 goto error
+tlib %BLIB% @b\win32\bc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% -ls -Iexamples examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -ls -Iexamples examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -ls -Iexamples examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -ls -Iexamples examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -ls -Iexamples examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -ls -Ilzotest lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -ls -Iminilzo 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/dos32/dj2.bat b/app/lzo/B/dos32/dj2.bat
index ac493992..02da9232 100644
--- a/app/lzo/B/dos32/dj2.bat
+++ b/app/lzo/B/dos32/dj2.bat
@@ -1,45 +1,45 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   DOS 32-bit

-@echo //   djgpp2 + gcc

-@echo //

-@call b\prepare.bat

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

-

-

-set BLIB=lib%BNAME%.a

-set CC=gcc

-set CF=@b/dos32/dj2.opt %CFI% %CFASM%

-set LF=%BLIB% -s

-

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

-@if errorlevel 1 goto error

-%CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S

-@if errorlevel 1 goto error

-ar rcs %BLIB% @b/win32/cygwin.rsp

-@if errorlevel 1 goto error

-

-%CC% %CF% -o dict.exe examples/dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -o lzopack.exe examples/lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -o precomp.exe examples/precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -o precomp2.exe examples/precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -o simple.exe examples/simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -s -Iinclude/lzo -o testmini.exe 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 //   DOS 32-bit
+@echo //   djgpp2 + gcc
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set BLIB=lib%BNAME%.a
+set CC=gcc
+set CF=@b/dos32/dj2.opt %CFI% %CFASM%
+set LF=%BLIB% -s
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+%CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S
+@if errorlevel 1 goto error
+ar rcs %BLIB% @b/win32/cygwin.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% -o dict.exe examples/dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -o lzopack.exe examples/lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -o precomp.exe examples/precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -o precomp2.exe examples/precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -o simple.exe examples/simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -s -Iinclude/lzo -o testmini.exe 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/dos32/dj2.opt b/app/lzo/B/dos32/dj2.opt
index 9cd02cd0..782eda58 100644
--- a/app/lzo/B/dos32/dj2.opt
+++ b/app/lzo/B/dos32/dj2.opt
@@ -1,6 +1,6 @@
--O2

--fomit-frame-pointer

--Wall

--Wcast-align

--Wcast-qual

--Wwrite-strings

+-O2
+-fomit-frame-pointer
+-Wall
+-Wcast-align
+-Wcast-qual
+-Wwrite-strings
diff --git a/app/lzo/B/dos32/dm.bat b/app/lzo/B/dos32/dm.bat
index 0449668c..3328e1f3 100644
--- a/app/lzo/B/dos32/dm.bat
+++ b/app/lzo/B/dos32/dm.bat
@@ -1,43 +1,43 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   DOS 32-bit

-@echo //   Digital Mars C/C++

-@echo //

-@call b\prepare.bat

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

-

-

-set CC=dmc -mx

-set CF=-o -w- %CFI% %CFASM%

-set LF=%BLIB% x32.lib

-

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

-@if errorlevel 1 goto error

-lib %BLIB% /b /c /n /noi @b\win32\bc.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

-

-set LF=x32.lib

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

-@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 //   DOS 32-bit
+@echo //   Digital Mars C/C++
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=dmc -mx
+set CF=-o -w- %CFI% %CFASM%
+set LF=%BLIB% x32.lib
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+lib %BLIB% /b /c /n /noi @b\win32\bc.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
+
+set LF=x32.lib
+%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c %LF%
+@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/dos32/emx.bat b/app/lzo/B/dos32/emx.bat
index ceb97e4d..631dceb3 100644
--- a/app/lzo/B/dos32/emx.bat
+++ b/app/lzo/B/dos32/emx.bat
@@ -1,45 +1,45 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   DOS 32-bit

-@echo //   emx + gcc

-@echo //

-@call b\prepare.bat

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

-

-

-set BLIB=%BNAME%.a

-set CC=gcc

-set CF=@b/dos32/dj2.opt %CFI% %CFASM%

-set LF=%BLIB% -s

-

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

-@if errorlevel 1 goto error

-%CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S

-@if errorlevel 1 goto error

-ar rcs %BLIB% @b/win32/cygwin.rsp

-@if errorlevel 1 goto error

-

-%CC% %CF% -o dict.exe examples/dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -o lzopack.exe examples/lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -o precomp.exe examples/precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -o precomp2.exe examples/precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -o simple.exe examples/simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -Iinclude/lzo -o testmini.exe 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 //   DOS 32-bit
+@echo //   emx + gcc
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set BLIB=%BNAME%.a
+set CC=gcc
+set CF=@b/dos32/dj2.opt %CFI% %CFASM%
+set LF=%BLIB% -s
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+%CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S
+@if errorlevel 1 goto error
+ar rcs %BLIB% @b/win32/cygwin.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% -o dict.exe examples/dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -o lzopack.exe examples/lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -o precomp.exe examples/precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -o precomp2.exe examples/precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -o simple.exe examples/simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iinclude/lzo -o testmini.exe 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/dos32/highc.bat b/app/lzo/B/dos32/highc.bat
index e3e28a7c..83d4cdc0 100644
--- a/app/lzo/B/dos32/highc.bat
+++ b/app/lzo/B/dos32/highc.bat
@@ -1,39 +1,39 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   DOS 32-bit

-@echo //   MetaWare High C/C++ (using Pharlap DOS extender)

-@echo //

-@call b\prepare.bat

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

-

-

-set CC=hc386

-set CF=-O3 -w4 %CFI% %CFASM%

-set LF=%BLIB%

-

-%CC% %CF% -w1 -c src\*.c

-@if errorlevel 1 goto error

-386lib %BLIB% -nobanner @b\dos32\highc.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

-

-

-@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 //   DOS 32-bit
+@echo //   MetaWare High C/C++ (using Pharlap DOS extender)
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=hc386
+set CF=-O3 -w4 %CFI% %CFASM%
+set LF=%BLIB%
+
+%CC% %CF% -w1 -c src\*.c
+@if errorlevel 1 goto error
+386lib %BLIB% -nobanner @b\dos32\highc.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
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/dos32/highc.rsp b/app/lzo/B/dos32/highc.rsp
index ef2dc7fa..d17a52ae 100644
--- a/app/lzo/B/dos32/highc.rsp
+++ b/app/lzo/B/dos32/highc.rsp
@@ -1,79 +1,73 @@
--create lzo1.obj

--create lzo1_99.obj

--create lzo1a.obj

--create lzo1a_99.obj

--create lzo1b_1.obj

--create lzo1b_2.obj

--create lzo1b_3.obj

--create lzo1b_4.obj

--create lzo1b_5.obj

--create lzo1b_6.obj

--create lzo1b_7.obj

--create lzo1b_8.obj

--create lzo1b_9.obj

--create lzo1b_99.obj

--create lzo1b_9x.obj

--create lzo1b_cc.obj

--create lzo1b_d1.obj

--create lzo1b_d2.obj

--create lzo1b_rr.obj

--create lzo1b_xx.obj

--create lzo1c_1.obj

--create lzo1c_2.obj

--create lzo1c_3.obj

--create lzo1c_4.obj

--create lzo1c_5.obj

--create lzo1c_6.obj

--create lzo1c_7.obj

--create lzo1c_8.obj

--create lzo1c_9.obj

--create lzo1c_99.obj

--create lzo1c_9x.obj

--create lzo1c_cc.obj

--create lzo1c_d1.obj

--create lzo1c_d2.obj

--create lzo1c_rr.obj

--create lzo1c_xx.obj

--create lzo1f_1.obj

--create lzo1f_9x.obj

--create lzo1f_d1.obj

--create lzo1f_d2.obj

--create lzo1x_1.obj

--create lzo1x_1k.obj

--create lzo1x_1l.obj

--create lzo1x_1o.obj

--create lzo1x_9x.obj

--create lzo1x_d1.obj

--create lzo1x_d2.obj

--create lzo1x_d3.obj

--create lzo1x_o.obj

--create lzo1y_1.obj

--create lzo1y_9x.obj

--create lzo1y_d1.obj

--create lzo1y_d2.obj

--create lzo1y_d3.obj

--create lzo1y_o.obj

--create lzo1z_9x.obj

--create lzo1z_d1.obj

--create lzo1z_d2.obj

--create lzo1z_d3.obj

--create lzo2a_9x.obj

--create lzo2a_d1.obj

--create lzo2a_d2.obj

--create lzo_crc.obj

--create lzo_init.obj

--create lzo_ptr.obj

--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

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

-@echo //

-@echo //   DOS 32-bit

-@echo //   Microway NDP C/C++

-@echo //

-@call b\prepare.bat

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

-

-

-set CC=mx486

-set CF=-ansi -on %CFI%

-set LF=%BLIB% -bind -map

-

-@REM %CC% %CF% -Isrc -c src\*.c

-for %%f in (src\*.c) do %CC% %CF% -Isrc -c %%f

-@if errorlevel 1 goto error

-ndplib %BLIB% @b\dos32\ndp.rsp

-@if errorlevel 1 goto error

-

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

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-

-%CC% %CF% -Dconst= -Ilzotest lzotest\lzotest.c %LF%

-@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 //   DOS 32-bit
+@echo //   Microway NDP C/C++
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=mx486
+set CF=-ansi -on %CFI%
+set LF=%BLIB% -bind -map
+
+@REM %CC% %CF% -Isrc -c src\*.c
+for %%f in (src\*.c) do %CC% %CF% -Isrc -c %%f
+@if errorlevel 1 goto error
+ndplib %BLIB% @b\dos32\ndp.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iexamples examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -Iexamples examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -Iexamples examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -Iexamples examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -Iexamples examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -Dconst= -Ilzotest lzotest\lzotest.c %LF%
+@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/dos32/ndp.rsp b/app/lzo/B/dos32/ndp.rsp
index c62b19eb..24c1d438 100644
--- a/app/lzo/B/dos32/ndp.rsp
+++ b/app/lzo/B/dos32/ndp.rsp
@@ -1,67 +1,67 @@
--add lzo1.obj

--add lzo1_99.obj

--add lzo1a.obj

--add lzo1a_99.obj

--add lzo1b_1.obj

--add lzo1b_2.obj

--add lzo1b_3.obj

--add lzo1b_4.obj

--add lzo1b_5.obj

--add lzo1b_6.obj

--add lzo1b_7.obj

--add lzo1b_8.obj

--add lzo1b_9.obj

--add lzo1b_99.obj

--add lzo1b_9x.obj

--add lzo1b_cc.obj

--add lzo1b_d1.obj

--add lzo1b_d2.obj

--add lzo1b_rr.obj

--add lzo1b_xx.obj

--add lzo1c_1.obj

--add lzo1c_2.obj

--add lzo1c_3.obj

--add lzo1c_4.obj

--add lzo1c_5.obj

--add lzo1c_6.obj

--add lzo1c_7.obj

--add lzo1c_8.obj

--add lzo1c_9.obj

--add lzo1c_99.obj

--add lzo1c_9x.obj

--add lzo1c_cc.obj

--add lzo1c_d1.obj

--add lzo1c_d2.obj

--add lzo1c_rr.obj

--add lzo1c_xx.obj

--add lzo1f_1.obj

--add lzo1f_9x.obj

--add lzo1f_d1.obj

--add lzo1f_d2.obj

--add lzo1x_1.obj

--add lzo1x_1k.obj

--add lzo1x_1l.obj

--add lzo1x_1o.obj

--add lzo1x_9x.obj

--add lzo1x_d1.obj

--add lzo1x_d2.obj

--add lzo1x_d3.obj

--add lzo1x_o.obj

--add lzo1y_1.obj

--add lzo1y_9x.obj

--add lzo1y_d1.obj

--add lzo1y_d2.obj

--add lzo1y_d3.obj

--add lzo1y_o.obj

--add lzo1z_9x.obj

--add lzo1z_d1.obj

--add lzo1z_d2.obj

--add lzo1z_d3.obj

--add lzo2a_9x.obj

--add lzo2a_d1.obj

--add lzo2a_d2.obj

--add lzo_crc.obj

--add lzo_init.obj

--add lzo_ptr.obj

--add lzo_str.obj

--add lzo_util.obj

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

-@echo //

-@echo //   DOS 32-bit

-@echo //   Symantec C/C++

-@echo //

-@call b\prepare.bat

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

-

-

-set CC=sc -mx

-set CF=-o -w- %CFI% %CFASM%

-set LF=%BLIB%

-

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

-@if errorlevel 1 goto error

-lib %BLIB% /b /c /n /noi @b\win32\bc.rsp

-@if errorlevel 1 goto error

-

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

-@if errorlevel 1 goto error

-%CC% dict.obj %LF%

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-%CC% lzopack.obj %LF%

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-%CC% precomp.obj %LF%

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-%CC% precomp2.obj %LF%

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-%CC% simple.obj %LF%

-@if errorlevel 1 goto error

-

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

-@if errorlevel 1 goto error

-%CC% lzotest.obj %LF%

-@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 //   DOS 32-bit
+@echo //   Symantec C/C++
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=sc -mx
+set CF=-o -w- %CFI% %CFASM%
+set LF=%BLIB%
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+lib %BLIB% /b /c /n /noi @b\win32\bc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% -c examples\dict.c
+@if errorlevel 1 goto error
+%CC% dict.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\lzopack.c
+@if errorlevel 1 goto error
+%CC% lzopack.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\precomp.c
+@if errorlevel 1 goto error
+%CC% precomp.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\precomp2.c
+@if errorlevel 1 goto error
+%CC% precomp2.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\simple.c
+@if errorlevel 1 goto error
+%CC% simple.obj %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -c lzotest\lzotest.c
+@if errorlevel 1 goto error
+%CC% lzotest.obj %LF%
+@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/dos32/wc.bat b/app/lzo/B/dos32/wc.bat
index bfa776d5..8817b19c 100644
--- a/app/lzo/B/dos32/wc.bat
+++ b/app/lzo/B/dos32/wc.bat
@@ -1,39 +1,39 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   DOS 32-bit

-@echo //   Watcom C/C++ (using DOS/4G extender)

-@echo //

-@call b\prepare.bat

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

-

-

-set CC=wcl386 -zq -mf -5r -bt#dos -l#dos4g

-set CF=-ox -zc %CFI% %CFASM%

-set LF=%BLIB%

-

-%CC% %CF% -c src\*.c

-@if errorlevel 1 goto error

-wlib -q -b -n -t %BLIB% @b\win32\wc.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

-

-

-@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 //   DOS 32-bit
+@echo //   Watcom C/C++ (using DOS/4G extender)
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=wcl386 -zq -mf -5r -bt#dos -l#dos4g
+set CF=-ox -zc %CFI% %CFASM%
+set LF=%BLIB%
+
+%CC% %CF% -c src\*.c
+@if errorlevel 1 goto error
+wlib -q -b -n -t %BLIB% @b\win32\wc.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
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/dos32/zc.bat b/app/lzo/B/dos32/zc.bat
index 0da77941..159e99ca 100644
--- a/app/lzo/B/dos32/zc.bat
+++ b/app/lzo/B/dos32/zc.bat
@@ -1,51 +1,51 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   DOS 32-bit

-@echo //   Zortech C/C++

-@echo //

-@call b\prepare.bat

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

-

-

-set CC=ztc -b -v0 -mx

-set CF=-o -w- -r %CFI% %CFASM%

-set LF=%BLIB%

-

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

-@if errorlevel 1 goto error

-zorlib %BLIB% @b\win32\bc.rsp

-@if errorlevel 1 goto error

-

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

-@if errorlevel 1 goto error

-%CC% dict.obj %LF%

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-%CC% lzopack.obj %LF%

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-%CC% precomp.obj %LF%

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-%CC% precomp2.obj %LF%

-@if errorlevel 1 goto error

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

-@if errorlevel 1 goto error

-%CC% simple.obj %LF%

-@if errorlevel 1 goto error

-

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

-@if errorlevel 1 goto error

-%CC% lzotest.obj %LF%

-@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 //   DOS 32-bit
+@echo //   Zortech C/C++
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=ztc -b -v0 -mx
+set CF=-o -w- -r %CFI% %CFASM%
+set LF=%BLIB%
+
+%CC% %CF% -Isrc -c @b\src.rsp
+@if errorlevel 1 goto error
+zorlib %BLIB% @b\win32\bc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% -c examples\dict.c
+@if errorlevel 1 goto error
+%CC% dict.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\lzopack.c
+@if errorlevel 1 goto error
+%CC% lzopack.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\precomp.c
+@if errorlevel 1 goto error
+%CC% precomp.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\precomp2.c
+@if errorlevel 1 goto error
+%CC% precomp2.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\simple.c
+@if errorlevel 1 goto error
+%CC% simple.obj %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -c lzotest\lzotest.c
+@if errorlevel 1 goto error
+%CC% lzotest.obj %LF%
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat