diff options
author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-23 14:06:25 +0100 |
---|---|---|
committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-23 14:06:25 +0100 |
commit | 79a9578a33ecd3093970bd18df677edc9214fafb (patch) | |
tree | 8ae5c6780a1fcd2124e71f27ad9b4256acd24268 /B/win32 | |
parent | 1bb1ce141783168d44a38cd1bb6b822eb13114fc (diff) | |
download | lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.gz lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.bz2 lzo-79a9578a33ecd3093970bd18df677edc9214fafb.zip |
Imported Upstream version 2.08upstream/2.08sandbox/kevinthierry/upstream
Diffstat (limited to 'B/win32')
-rw-r--r-- | B/win32/bc.bat | 2 | ||||
-rw-r--r-- | B/win32/bc.rsp | 8 | ||||
-rw-r--r-- | B/win32/cygwin.bat | 6 | ||||
-rw-r--r-- | B/win32/cygwin.rsp | 6 | ||||
-rw-r--r-- | B/win32/dm.bat | 2 | ||||
-rw-r--r-- | B/win32/ic.bat | 6 | ||||
-rw-r--r-- | B/win32/lccwin32.bat | 2 | ||||
-rw-r--r-- | B/win32/mingw.bat | 6 | ||||
-rw-r--r-- | B/win32/mwerks.bat | 2 | ||||
-rw-r--r-- | B/win32/pellesc.bat | 2 | ||||
-rw-r--r-- | B/win32/pgi.bat | 2 | ||||
-rw-r--r-- | B/win32/pw32.bat | 6 | ||||
-rw-r--r-- | B/win32/rsxnt.bat | 2 | ||||
-rw-r--r-- | B/win32/sc.bat | 2 | ||||
-rw-r--r-- | B/win32/vc.bat | 4 | ||||
-rw-r--r-- | B/win32/vc.rsp | 6 | ||||
-rw-r--r-- | B/win32/vc_dll.bat | 4 | ||||
-rw-r--r-- | B/win32/vc_dll.def | 6 | ||||
-rw-r--r-- | B/win32/wc.bat | 2 | ||||
-rw-r--r-- | B/win32/wc.rsp | 6 |
20 files changed, 26 insertions, 56 deletions
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'
|