diff options
Diffstat (limited to 'B')
67 files changed, 60 insertions, 1113 deletions
diff --git a/B/00README.TXT b/B/00README.TXT index f78a0b7..17d8ef8 100644 --- a/B/00README.TXT +++ b/B/00README.TXT @@ -4,10 +4,10 @@ Simple make drivers for DOS, Windows, OS/2 and other systems This directory contains a bunch of simple build scripts - I've tried
to make them as foolproof as possible.
-To build LZO for your system type `b\OS\COMPILER' in the base directory,
-e.g. `b\win32\vc.bat' will build the Win32 Visual C/C++ version.
+To build LZO for your system type 'b\OS\COMPILER' in the base directory,
+e.g. 'b\win32\vc.bat' will build the Win32 Visual C/C++ version.
-After building do a basic test by running `lzotest.exe -mlzo COPYING'.
+After building do a basic test by running 'lzotest.exe -mlzo COPYING'.
util\check.sh is an example of a more thorough test driver.
Please send me your additional/improved versions.
@@ -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/B/dos16/bc.bat b/B/dos16/bc.bat deleted file mode 100644 index 13ed99f..0000000 --- a/B/dos16/bc.bat +++ /dev/null @@ -1,39 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Borland C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=bcc -ml -f-
-set CF=-O1 -d -w -w-rch -w-sig %CFI% -Iinclude\lzo
-set LF=%BLIB%
-
-%CC% %CF% -Isrc -c @b\src.rsp
-@if errorlevel 1 goto error
-tlib %BLIB% @b\dos16\bc.rsp
-@if errorlevel 1 goto error
-
-%CC% %CF% -f -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% -f -ls -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/B/dos16/bc.rsp b/B/dos16/bc.rsp deleted file mode 100644 index 8a1d83e..0000000 --- a/B/dos16/bc.rsp +++ /dev/null @@ -1,67 +0,0 @@ -+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/B/dos16/bc_286.bat b/B/dos16/bc_286.bat deleted file mode 100644 index eb5ea84..0000000 --- a/B/dos16/bc_286.bat +++ /dev/null @@ -1,42 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Borland C/C++ + Pharlap 286DOS-Extender
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=bcc286 -ml -2
-set CF=-O1 -d -w -w-rch -w-sig %CFI% -Iinclude\lzo
-set LF=%BLIB%
-
-%CC% %CF% -Isrc -c @b\src.rsp
-@if errorlevel 1 goto error
-tlib %BLIB% @b\dos16\bc.rsp
-@if errorlevel 1 goto error
-
-%CC% %CF% -Iexamples examples\dict.c %LF%
-@if errorlevel 1 goto error
-%CC% %CF% -Iexamples -DWITH_TIMER 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% -Ilzotest lzotest\lzotest.c %LF%
-@if errorlevel 1 goto error
-
-%CC% %CF% -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/B/dos16/bc_pp.bat b/B/dos16/bc_pp.bat deleted file mode 100644 index 513fae4..0000000 --- a/B/dos16/bc_pp.bat +++ /dev/null @@ -1,42 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Borland C/C++ + Borland PowerPack 1.0 (DPMI16)
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=bcc -ml -2 -WX
-set CF=-O1 -d -w -w-sig %CFI% -Iinclude\lzo
-set LF=%BLIB%
-
-%CC% %CF% -Isrc -c @b\src.rsp
-@if errorlevel 1 goto error
-tlib %BLIB% @b\dos16\bc.rsp
-@if errorlevel 1 goto error
-
-%CC% %CF% -Iexamples examples\dict.c %LF%
-@if errorlevel 1 goto error
-%CC% %CF% -Iexamples -DWITH_TIMER 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% -Ilzotest lzotest\lzotest.c %LF%
-@if errorlevel 1 goto error
-
-%CC% %CF% -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/B/dos16/dm.bat b/B/dos16/dm.bat deleted file mode 100644 index 5c0e03e..0000000 --- a/B/dos16/dm.bat +++ /dev/null @@ -1,39 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Digital Mars C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=dmc -ml
-set CF=-o -w- %CFI%
-set LF=%BLIB%
-
-%CC% %CF% -c @b\src.rsp
-@if errorlevel 1 goto error
-lib %BLIB% /b /c /n /noi @b\dos16\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
-
-
-@call b\done.bat
-@goto end
-:error
-@echo ERROR during build!
-:end
-@call b\unset.bat
diff --git a/B/dos16/mc.bat b/B/dos16/mc.bat deleted file mode 100644 index 4112d0f..0000000 --- a/B/dos16/mc.bat +++ /dev/null @@ -1,52 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Microsoft C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=cl -nologo -AL
-set CF=-O -Gf -W3 %CFI%
-set LF=/map
-
-@REM %CC% %CF% -c src\*.c
-for %%f in (src\*.c) do %CC% %CF% -c %%f
-@if errorlevel 1 goto error
-lib /nologo %BLIB% @b\dos16\bc.rsp;
-@if errorlevel 1 goto error
-
-%CC% %CF% -c examples\dict.c
-@if errorlevel 1 goto error
-link %LF% dict.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\lzopack.c
-@if errorlevel 1 goto error
-link %LF% lzopack.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\precomp.c
-@if errorlevel 1 goto error
-link %LF% precomp.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\precomp2.c
-@if errorlevel 1 goto error
-link %LF% precomp2.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\simple.c
-@if errorlevel 1 goto error
-link %LF% simple.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-
-%CC% %CF% -c lzotest\lzotest.c
-@if errorlevel 1 goto error
-link %LF% lzotest.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-
-
-@call b\done.bat
-@goto end
-:error
-@echo ERROR during build!
-:end
-@call b\unset.bat
diff --git a/B/dos16/mc_qc.bat b/B/dos16/mc_qc.bat deleted file mode 100644 index dfe8e04..0000000 --- a/B/dos16/mc_qc.bat +++ /dev/null @@ -1,52 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Microsoft C/C++ (QuickC)
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=cl -nologo -qc -AL
-set CF=-O -Gf -W3 %CFI%
-set LF=/map
-
-@REM %CC% %CF% -c src\*.c
-for %%f in (src\*.c) do %CC% %CF% -c %%f
-@if errorlevel 1 goto error
-lib /nologo %BLIB% @b\dos16\bc.rsp;
-@if errorlevel 1 goto error
-
-%CC% %CF% -c examples\dict.c
-@if errorlevel 1 goto error
-link %LF% dict.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\lzopack.c
-@if errorlevel 1 goto error
-link %LF% lzopack.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\precomp.c
-@if errorlevel 1 goto error
-link %LF% precomp.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\precomp2.c
-@if errorlevel 1 goto error
-link %LF% precomp2.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\simple.c
-@if errorlevel 1 goto error
-link %LF% simple.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-
-%CC% %CF% -c lzotest\lzotest.c
-@if errorlevel 1 goto error
-link %LF% lzotest.obj,,,%BLIB%;
-@if errorlevel 1 goto error
-
-
-@call b\done.bat
-@goto end
-:error
-@echo ERROR during build!
-:end
-@call b\unset.bat
diff --git a/B/dos16/qc.bat b/B/dos16/qc.bat deleted file mode 100644 index 473fc6d..0000000 --- a/B/dos16/qc.bat +++ /dev/null @@ -1,40 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Microsoft QuickC
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=qcl -nologo -AL
-set CF=-O -Gf -W3 %CFI%
-set LF=%BLIB% -Fm
-
-@REM %CC% %CF% -c src\*.c
-for %%f in (src\*.c) do %CC% %CF% -c %%f
-@if errorlevel 1 goto error
-lib /nologo %BLIB% @b\dos16\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
-
-
-@call b\done.bat
-@goto end
-:error
-@echo ERROR during build!
-:end
-@call b\unset.bat
diff --git a/B/dos16/sc.bat b/B/dos16/sc.bat deleted file mode 100644 index d57d2b9..0000000 --- a/B/dos16/sc.bat +++ /dev/null @@ -1,53 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Symantec C/C++
-@echo //
-@echo // NOTE: LZO breaks the optimizer, so we disable optimizations
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=sc -ml
-set CF=-w- %CFI%
-set LF=%BLIB%
-
-%CC% %CF% -c @b\src.rsp
-@if errorlevel 1 goto error
-lib %BLIB% /b /c /n /noi @b\dos16\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/B/dos16/tc.bat b/B/dos16/tc.bat deleted file mode 100644 index a90de3b..0000000 --- a/B/dos16/tc.bat +++ /dev/null @@ -1,39 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Turbo C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=tcc -ml -f-
-set CF=-O -G -w -w-rch -w-sig %CFI% -Iinclude\lzo
-set LF=%BLIB%
-
-%CC% %CF% -Isrc -c src\*.c
-@if errorlevel 1 goto error
-tlib %BLIB% @b\dos16\bc.rsp
-@if errorlevel 1 goto error
-
-%CC% %CF% -f -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% -f -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/B/dos16/vc.bat b/B/dos16/vc.bat deleted file mode 100644 index 887cfa1..0000000 --- a/B/dos16/vc.bat +++ /dev/null @@ -1,39 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Microsoft Visual C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=cl -nologo -AL
-set CF=-O -Gf -Gs -Gy -W3 %CFI%
-set LF=%BLIB% -Fm
-
-%CC% %CF% -c @b\src.rsp
-@if errorlevel 1 goto error
-lib /nologo %BLIB% @b\dos16\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
-
-
-@call b\done.bat
-@goto end
-:error
-@echo ERROR during build!
-:end
-@call b\unset.bat
diff --git a/B/dos16/vc_qc.bat b/B/dos16/vc_qc.bat deleted file mode 100644 index 4f3b5b6..0000000 --- a/B/dos16/vc_qc.bat +++ /dev/null @@ -1,39 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Microsoft Visual C/C++ (QuickC)
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=cl -nologo -qc -AL
-set CF=-O -Gf -Gy -W3 %CFI%
-set LF=%BLIB% -Fm
-
-%CC% %CF% -c @b\src.rsp
-@if errorlevel 1 goto error
-lib /nologo %BLIB% @b\dos16\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
-
-
-@call b\done.bat
-@goto end
-:error
-@echo ERROR during build!
-:end
-@call b\unset.bat
diff --git a/B/dos16/wc.bat b/B/dos16/wc.bat deleted file mode 100644 index 9b0f563..0000000 --- a/B/dos16/wc.bat +++ /dev/null @@ -1,39 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // DOS 16-bit
-@echo // Watcom C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=wcl -zq -ml -bt#dos -l#dos
-set CF=-ox %CFI%
-set LF=%BLIB%
-
-%CC% %CF% -c src\*.c
-@if errorlevel 1 goto error
-wlib -q -b -n -t %BLIB% @b\dos16\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/B/dos16/wc.rsp b/B/dos16/wc.rsp deleted file mode 100644 index c8e1c9f..0000000 --- a/B/dos16/wc.rsp +++ /dev/null @@ -1,67 +0,0 @@ -+'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/B/dos32/bc_pp.bat b/B/dos32/bc_pp.bat index 1079f9e..7706346 100644 --- a/B/dos32/bc_pp.bat +++ b/B/dos32/bc_pp.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/dos32/dj2.bat b/B/dos32/dj2.bat index b4013a4..85928d0 100644 --- a/B/dos32/dj2.bat +++ b/B/dos32/dj2.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/dos32/dj2.opt b/B/dos32/dj2.opt index cc5a5dc..9cd02cd 100644 --- a/B/dos32/dj2.opt +++ b/B/dos32/dj2.opt @@ -4,4 +4,3 @@ -Wcast-align
-Wcast-qual
-Wwrite-strings
--Wno-uninitialized
diff --git a/B/dos32/dm.bat b/B/dos32/dm.bat index 69a0d91..9384bed 100644 --- a/B/dos32/dm.bat +++ b/B/dos32/dm.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/dos32/emx.bat b/B/dos32/emx.bat index c25f60b..0442342 100644 --- a/B/dos32/emx.bat +++ b/B/dos32/emx.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/dos32/highc.bat b/B/dos32/highc.bat index f0e012e..a988116 100644 --- a/B/dos32/highc.bat +++ b/B/dos32/highc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/dos32/highc.rsp b/B/dos32/highc.rsp index ef2dc7f..d477b96 100644 --- a/B/dos32/highc.rsp +++ b/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/B/dos32/ndp.bat b/B/dos32/ndp.bat index 42c94c7..2b20311 100644 --- a/B/dos32/ndp.bat +++ b/B/dos32/ndp.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/dos32/sc.bat b/B/dos32/sc.bat index 48e22ee..44fed18 100644 --- a/B/dos32/sc.bat +++ b/B/dos32/sc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/dos32/wc.bat b/B/dos32/wc.bat index cf30114..21de11d 100644 --- a/B/dos32/wc.bat +++ b/B/dos32/wc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/dos32/zc.bat b/B/dos32/zc.bat index 89b2931..193502f 100644 --- a/B/dos32/zc.bat +++ b/B/dos32/zc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/generic/Makefile b/B/generic/Makefile index 88caf3a..322ebe8 100644 --- a/B/generic/Makefile +++ b/B/generic/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996-2008 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 @@ -14,7 +14,7 @@ AR ?= ar CC ?= cc CFLAGS ?= -O -CFI = -I$(top_srcdir)/include -I$(top_srcdir) +CFI = -I$(top_srcdir)/include -I$(top_srcdir) -I$(top_srcdir)/src BNAME = lzo2 BLIB = lib$(BNAME).a diff --git a/B/generic/build.sh b/B/generic/build.sh index 5456e05..0480314 100755 --- a/B/generic/build.sh +++ b/B/generic/build.sh @@ -1,7 +1,7 @@ #! /bin/sh # vi:ts=4:et set -e -echo "// Copyright (C) 1996-2008 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" @@ -15,7 +15,7 @@ test "X${CFLAGS+set}" = Xset || CFLAGS="-O" # LZO_EXTRA_CPPFLAGS, LZO_EXTRA_CFLAGS, LZO_EXTRA_LDFLAGS # LZO_EXTRA_SOURCES, LZO_EXTRA_OBJECTS, LZO_EXTRA_LIBS -CFI="-I${top_srcdir}/include -I${top_srcdir}" +CFI="-I${top_srcdir}/include -I${top_srcdir} -I${top_srcdir}/src" BNAME=lzo2 BLIB=lib${BNAME}.a diff --git a/B/generic/build_gcc.sh b/B/generic/build_gcc.sh index 3aaa4aa..179d8c0 100755 --- a/B/generic/build_gcc.sh +++ b/B/generic/build_gcc.sh @@ -10,7 +10,7 @@ UNAME_MACHINE=unknown CC="gcc -fPIC" CC="gcc -static" CC="gcc" -CFLAGS="-Wall -Wno-uninitialized -O2 -fomit-frame-pointer" +CFLAGS="-Wall -O2 -fomit-frame-pointer" # delete the next line to disable assembler support UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown diff --git a/B/generic/clean.sh b/B/generic/clean.sh index 0a946cc..2728d2d 100755 --- a/B/generic/clean.sh +++ b/B/generic/clean.sh @@ -1,6 +1,6 @@ #! /bin/sh # vi:ts=4:et -# Copyright (C) 1996-2008 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/B/os2/emx.bat b/B/os2/emx.bat index 0306a52..2367d65 100644 --- a/B/os2/emx.bat +++ b/B/os2/emx.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/os2/wc.bat b/B/os2/wc.bat index bc4de97..44b43f5 100644 --- a/B/os2/wc.bat +++ b/B/os2/wc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/os2/zc.bat b/B/os2/zc.bat index 0627e3f..5e4e7f6 100644 --- a/B/os2/zc.bat +++ b/B/os2/zc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/os2_16/mc.bat b/B/os2_16/mc.bat deleted file mode 100644 index 4e256f3..0000000 --- a/B/os2_16/mc.bat +++ /dev/null @@ -1,43 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // OS/2 16-bit
-@echo // Microsoft C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=cl -nologo -AL -G2
-set CF=-D__OS2__ -O -Gf -Gs -W3 %CFI%
-set LF=%BLIB% -Lp -Fm /link /stack:8096
-
-@REM %CC% %CF% -c src\*.c
-for %%f in (src\*.c) do %CC% %CF% -c %%f
-@if errorlevel 1 goto error
-lib /nologo %BLIB% @b\dos16\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
-
-%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/B/os2_16/wc.bat b/B/os2_16/wc.bat deleted file mode 100644 index 472188a..0000000 --- a/B/os2_16/wc.bat +++ /dev/null @@ -1,42 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // OS/2 16-bit
-@echo // Watcom C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=wcl -zq -ml -2 -bt#os2 -l#os2
-set CF=-ox %CFI%
-set LF=%BLIB%
-
-%CC% %CF% -c src\*.c
-@if errorlevel 1 goto error
-wlib -q -b -n -t %BLIB% @b\dos16\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/B/prepare.bat b/B/prepare.bat index 2c958f2..34bac19 100644 --- a/B/prepare.bat +++ b/B/prepare.bat @@ -1,7 +1,7 @@ @call b\unset.bat
@call b\clean.bat
-@set CFI=-Iinclude -I.
+@set CFI=-Iinclude -I. -Isrc
@set CFASM=-DLZO_USE_ASM
@set BNAME=lzo2
@set BLIB=lzo2.lib
diff --git a/B/win16/bc.bat b/B/win16/bc.bat deleted file mode 100644 index f16443d..0000000 --- a/B/win16/bc.bat +++ /dev/null @@ -1,42 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // Windows 16-bit
-@echo // Borland C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=bcc -ml -2 -tW -h
-set CF=-O1 -d -w -w-rch -w-sig %CFI% -Iinclude\lzo
-set LF=%BLIB%
-
-%CC% %CF% -Isrc -c @b\src.rsp
-@if errorlevel 1 goto error
-tlib %BLIB% @b\dos16\bc.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% -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/B/win16/dm.bat b/B/win16/dm.bat deleted file mode 100644 index 54226da..0000000 --- a/B/win16/dm.bat +++ /dev/null @@ -1,43 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // Windows 16-bit
-@echo // Digital Mars C/C++ (using WINIO)
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=dmc -ml -2 -W
-set CF=-o -w- %CFI%
-set LF=%BLIB% libw.lib commdlg.lib lwindos.lib /L/map/stack:8096
-
-%CC% %CF% -c @b\src.rsp
-@if errorlevel 1 goto error
-lib %BLIB% /b /c /n /noi @b\dos16\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=libw.lib commdlg.lib lwindos.lib /L/map/stack:8096
-%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/B/win16/mc.bat b/B/win16/mc.bat deleted file mode 100644 index 5540086..0000000 --- a/B/win16/mc.bat +++ /dev/null @@ -1,56 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // Windows 16-bit
-@echo // Microsoft C/C++ (using QuickWin)
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=cl -nologo -AL -G2 -Mq
-set CF=-O -Gf -W3 %CFI%
-set LF=/seg:256 /stack:8096 /nod:llibce /map
-
-%CC% %CF% -c src\*.c
-@if errorlevel 1 goto error
-lib /nologo %BLIB% @b\dos16\bc.rsp;
-@if errorlevel 1 goto error
-
-%CC% %CF% -c examples\dict.c
-@if errorlevel 1 goto error
-link %LF% dict.obj,,,llibcewq.lib libw.lib %BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\lzopack.c
-@if errorlevel 1 goto error
-link %LF% lzopack.obj,,,llibcewq.lib libw.lib %BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\precomp.c
-@if errorlevel 1 goto error
-link %LF% precomp.obj,,,llibcewq.lib libw.lib %BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\precomp2.c
-@if errorlevel 1 goto error
-link %LF% precomp2.obj,,,llibcewq.lib libw.lib %BLIB%;
-@if errorlevel 1 goto error
-%CC% %CF% -c examples\simple.c
-@if errorlevel 1 goto error
-link %LF% simple.obj,,,llibcewq.lib libw.lib %BLIB%;
-@if errorlevel 1 goto error
-
-%CC% %CF% -c lzotest\lzotest.c
-@if errorlevel 1 goto error
-link %LF% lzotest.obj,,,llibcewq.lib libw.lib %BLIB%;
-@if errorlevel 1 goto error
-
-%CC% %CF% -Iinclude\lzo -c minilzo\testmini.c minilzo\minilzo.c
-@if errorlevel 1 goto error
-link %LF% testmini.obj minilzo.obj,,,llibcewq.lib libw.lib;
-@if errorlevel 1 goto error
-
-
-@call b\done.bat
-@goto end
-:error
-@echo ERROR during build!
-:end
-@call b\unset.bat
diff --git a/B/win16/sc.bat b/B/win16/sc.bat deleted file mode 100644 index bcc4619..0000000 --- a/B/win16/sc.bat +++ /dev/null @@ -1,53 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // Windows 16-bit
-@echo // Symantec C/C++ (using WINIO)
-@echo //
-@echo // NOTE: LZO breaks the optimizer, so we disable optimizations
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=sc -ml -2 -W
-set CF=-w- %CFI%
-set LF=%BLIB% libw.lib commdlg.lib lwindos.lib /L/map/stack:8096
-
-%CC% %CF% -c @b\src.rsp
-@if errorlevel 1 goto error
-lib %BLIB% /b /c /n /noi @b\dos16\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/B/win16/vc.bat b/B/win16/vc.bat deleted file mode 100644 index dfb813a..0000000 --- a/B/win16/vc.bat +++ /dev/null @@ -1,43 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // Windows 16-bit
-@echo // Microsoft Visual C/C++ (using QuickWin)
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=cl -nologo -AL -G2 -Mq
-set CF=-O -Gf -Gs -Gy -W3 %CFI%
-set LF=%BLIB% -Fm /link /seg:256
-
-%CC% %CF% -c @b\src.rsp
-@if errorlevel 1 goto error
-lib /nologo %BLIB% @b\dos16\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=-Fm /link /seg:256
-%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/B/win16/wc.bat b/B/win16/wc.bat deleted file mode 100644 index e2d45a8..0000000 --- a/B/win16/wc.bat +++ /dev/null @@ -1,42 +0,0 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-@echo //
-@echo // Windows 16-bit
-@echo // Watcom C/C++
-@echo //
-@call b\prepare.bat
-@if "%BECHO%"=="n" echo off
-
-
-set CC=wcl -zq -ml -2 -bw -bt#windows -l#windows
-set CF=-ox %CFI%
-set LF=%BLIB%
-
-%CC% %CF% -c src\*.c
-@if errorlevel 1 goto error
-wlib -q -b -n -t %BLIB% @b\dos16\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/B/win32/bc.bat b/B/win32/bc.bat index 25864e0..811acdb 100644 --- a/B/win32/bc.bat +++ b/B/win32/bc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/bc.rsp b/B/win32/bc.rsp index 477f1ff..b48a182 100644 --- a/B/win32/bc.rsp +++ b/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/B/win32/cygwin.bat b/B/win32/cygwin.bat index ff1aa17..57533e0 100644 --- a/B/win32/cygwin.bat +++ b/B/win32/cygwin.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
@echo //
@echo // Windows 32-bit
@echo // cygwin + gcc
@@ -12,7 +12,7 @@ set CC=gcc set CF=-O2 -fomit-frame-pointer -Wall %CFI% %CFASM%
set LF=%BLIB% -lwinmm -s
-%CC% %CF% -Wno-uninitialized -c src/*.c
+%CC% %CF% -c src/*.c
@if errorlevel 1 goto error
%CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S
@if errorlevel 1 goto error
@@ -33,7 +33,7 @@ ar rcs %BLIB% @b/win32/cygwin.rsp %CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%
@if errorlevel 1 goto error
-%CC% %CF% -Iinclude/lzo -Wno-uninitialized -o testmini.exe minilzo/testmini.c minilzo/minilzo.c
+%CC% %CF% -Iinclude/lzo -o testmini.exe minilzo/testmini.c minilzo/minilzo.c
@if errorlevel 1 goto error
diff --git a/B/win32/cygwin.rsp b/B/win32/cygwin.rsp index 2c9c9f9..62eab38 100644 --- a/B/win32/cygwin.rsp +++ b/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/B/win32/dm.bat b/B/win32/dm.bat index 0bfd09f..5c65dfe 100644 --- a/B/win32/dm.bat +++ b/B/win32/dm.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/ic.bat b/B/win32/ic.bat index 0394b59..f9f6f5a 100644 --- a/B/win32/ic.bat +++ b/B/win32/ic.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/lccwin32.bat b/B/win32/lccwin32.bat index 6ab5e42..e01ee98 100644 --- a/B/win32/lccwin32.bat +++ b/B/win32/lccwin32.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/mingw.bat b/B/win32/mingw.bat index 43eb591..81830ae 100644 --- a/B/win32/mingw.bat +++ b/B/win32/mingw.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
@echo //
@echo // Windows 32-bit
@echo // MinGW + gcc
@@ -12,7 +12,7 @@ set CC=gcc set CF=-O2 -fomit-frame-pointer -Wall %CFI% %CFASM%
set LF=%BLIB% -lwinmm -s
-%CC% %CF% -Wno-uninitialized -c src/*.c
+%CC% %CF% -c src/*.c
@if errorlevel 1 goto error
%CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S
@if errorlevel 1 goto error
@@ -33,7 +33,7 @@ ar rcs %BLIB% *.o %CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%
@if errorlevel 1 goto error
-%CC% %CF% -Iinclude/lzo -Wno-uninitialized -o testmini.exe minilzo/testmini.c minilzo/minilzo.c
+%CC% %CF% -Iinclude/lzo -o testmini.exe minilzo/testmini.c minilzo/minilzo.c
@if errorlevel 1 goto error
diff --git a/B/win32/mwerks.bat b/B/win32/mwerks.bat index feb32e1..8aad148 100644 --- a/B/win32/mwerks.bat +++ b/B/win32/mwerks.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/pellesc.bat b/B/win32/pellesc.bat index 1968fb8..7123f1b 100644 --- a/B/win32/pellesc.bat +++ b/B/win32/pellesc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/pgi.bat b/B/win32/pgi.bat index d7b84e6..82e1772 100644 --- a/B/win32/pgi.bat +++ b/B/win32/pgi.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/pw32.bat b/B/win32/pw32.bat index 1b8e1c8..583ca49 100644 --- a/B/win32/pw32.bat +++ b/B/win32/pw32.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+@echo // Copyright (C) 1996-2014 Markus F.X.J. Oberhumer
@echo //
@echo // Windows 32-bit
@echo // PW32 + gcc
@@ -12,7 +12,7 @@ set CC=gcc set CF=-O2 -fomit-frame-pointer -Wall %CFI% %CFASM%
set LF=%BLIB% -lwinmm -s
-%CC% %CF% -Wno-uninitialized -c src/*.c
+%CC% %CF% -c src/*.c
@if errorlevel 1 goto error
%CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S
@if errorlevel 1 goto error
@@ -33,7 +33,7 @@ ar rcs %BLIB% *.o %CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%
@if errorlevel 1 goto error
-%CC% %CF% -Iinclude/lzo -Wno-uninitialized -o testmini.exe minilzo/testmini.c minilzo/minilzo.c
+%CC% %CF% -Iinclude/lzo -o testmini.exe minilzo/testmini.c minilzo/minilzo.c
@if errorlevel 1 goto error
diff --git a/B/win32/rsxnt.bat b/B/win32/rsxnt.bat index 4d7a4a2..3077f6f 100644 --- a/B/win32/rsxnt.bat +++ b/B/win32/rsxnt.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/sc.bat b/B/win32/sc.bat index 7f3c183..b1f5c46 100644 --- a/B/win32/sc.bat +++ b/B/win32/sc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/vc.bat b/B/win32/vc.bat index 06aaf25..0b7d1f6 100644 --- a/B/win32/vc.bat +++ b/B/win32/vc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/vc.rsp b/B/win32/vc.rsp index 6c5ca7e..690bec1 100644 --- a/B/win32/vc.rsp +++ b/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/B/win32/vc_dll.bat b/B/win32/vc_dll.bat index 06c0cef..72788c0 100644 --- a/B/win32/vc_dll.bat +++ b/B/win32/vc_dll.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/vc_dll.def b/B/win32/vc_dll.def index cade569..215fb86 100644 --- a/B/win32/vc_dll.def +++ b/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/B/win32/wc.bat b/B/win32/wc.bat index c711e6c..64e34a2 100644 --- a/B/win32/wc.bat +++ b/B/win32/wc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win32/wc.rsp b/B/win32/wc.rsp index 5bf8b8c..503667b 100644 --- a/B/win32/wc.rsp +++ b/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/B/win64/ic.bat b/B/win64/ic.bat index 635149f..154d5e4 100644 --- a/B/win64/ic.bat +++ b/B/win64/ic.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win64/ic_dll.bat b/B/win64/ic_dll.bat index d0d4525..620fadc 100644 --- a/B/win64/ic_dll.bat +++ b/B/win64/ic_dll.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win64/vc.bat b/B/win64/vc.bat index 3386b91..1aada92 100644 --- a/B/win64/vc.bat +++ b/B/win64/vc.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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/B/win64/vc_dll.bat b/B/win64/vc_dll.bat index 7716129..63ea5fc 100644 --- a/B/win64/vc_dll.bat +++ b/B/win64/vc_dll.bat @@ -1,4 +1,4 @@ -@echo // Copyright (C) 1996-2008 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
diff --git a/B/win64/vc_dll.def b/B/win64/vc_dll.def index 91681f8..e80a637 100644 --- a/B/win64/vc_dll.def +++ b/B/win64/vc_dll.def @@ -1 +1 @@ -LIBRARY lzo2
+EXPORTS
|