Merge branch 'develop'0.8.0

3 files changed, 138 insertions, 138 deletions

diff --git a/app/lzo/B/os2/emx.bat b/app/lzo/B/os2/emx.bat
index 35e26fc5..2367d65c 100644
--- a/app/lzo/B/os2/emx.bat
+++ b/app/lzo/B/os2/emx.bat
@@ -1,45 +1,45 @@
-@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
-@echo //
-@echo //   OS/2 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 //   OS/2 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/os2/wc.bat b/app/lzo/B/os2/wc.bat
index 44ca3ab1..44b43f50 100644
--- a/app/lzo/B/os2/wc.bat
+++ b/app/lzo/B/os2/wc.bat
@@ -1,42 +1,42 @@
-@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
-@echo //
-@echo //   OS/2 32-bit
-@echo //   Watcom C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=wcl386 -zq -mf -5r -bt#os2 -l#os2v2
-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
-
-%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 //   OS/2 32-bit

+@echo //   Watcom C/C++

+@echo //

+@call b\prepare.bat

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

+

+

+set CC=wcl386 -zq -mf -5r -bt#os2 -l#os2v2

+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

+

+%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/os2/zc.bat b/app/lzo/B/os2/zc.bat
index db751a67..5e4e7f68 100644
--- a/app/lzo/B/os2/zc.bat
+++ b/app/lzo/B/os2/zc.bat
@@ -1,51 +1,51 @@
-@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
-@echo //
-@echo //   OS/2 32-bit
-@echo //   Zortech C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=ztc -b -v0 -mf
-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 //   OS/2 32-bit

+@echo //   Zortech C/C++

+@echo //

+@call b\prepare.bat

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

+

+

+set CC=ztc -b -v0 -mf

+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