mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00
[libpng15] Imported from libpng-1.5.7rc02.tar
This commit is contained in:
Glenn Randers-Pehrson
parent
4f547b7177
commit
e22ea758e4
5
ANNOUNCE
5
ANNOUNCE
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Libpng 1.5.7rc02 - December 2, 2011
|
Libpng 1.5.7rc02 - December 5, 2011
|
||||||
|
|
||||||
This is not intended to be a public release. It will be replaced
|
This is not intended to be a public release. It will be replaced
|
||||||
within a few weeks by a public version or by another test version.
|
within a few weeks by a public version or by another test version.
|
||||||
@ -117,11 +117,12 @@ Version 1.5.7rc01 [December 1, 2011]
|
|||||||
Replaced an "#if" with "#ifdef" in pngrtran.c
|
Replaced an "#if" with "#ifdef" in pngrtran.c
|
||||||
Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)
|
Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)
|
||||||
|
|
||||||
Version 1.5.7rc02 [December 2, 2011]
|
Version 1.5.7rc02 [December 5, 2011]
|
||||||
Revised project files and contrib/pngvalid/pngvalid.c to account for
|
Revised project files and contrib/pngvalid/pngvalid.c to account for
|
||||||
the relocation of pngvalid into contrib/libtests.
|
the relocation of pngvalid into contrib/libtests.
|
||||||
Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,
|
Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,
|
||||||
as in libpng-1.5.4.
|
as in libpng-1.5.4.
|
||||||
|
Put CRLF line endings in the owatcom project files.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
|||||||
3
CHANGES
3
CHANGES
@ -3762,11 +3762,12 @@ Version 1.5.7rc01 [December 1, 2011]
|
|||||||
Replaced an "#if" with "#ifdef" in pngrtran.c
|
Replaced an "#if" with "#ifdef" in pngrtran.c
|
||||||
Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)
|
Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)
|
||||||
|
|
||||||
Version 1.5.7rc02 [December 2, 2011]
|
Version 1.5.7rc02 [December 5, 2011]
|
||||||
Revised project files and contrib/pngvalid/pngvalid.c to account for
|
Revised project files and contrib/pngvalid/pngvalid.c to account for
|
||||||
the relocation of pngvalid into contrib/libtests.
|
the relocation of pngvalid into contrib/libtests.
|
||||||
Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,
|
Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,
|
||||||
as in libpng-1.5.4.
|
as in libpng-1.5.4.
|
||||||
|
Put CRLF line endings in the owatcom project files.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
|||||||
4
LICENSE
4
LICENSE
@ -10,7 +10,7 @@ this sentence.
|
|||||||
|
|
||||||
This code is released under the libpng license.
|
This code is released under the libpng license.
|
||||||
|
|
||||||
libpng versions 1.2.6, August 15, 2004, through 1.5.7rc02, December 2, 2011, are
|
libpng versions 1.2.6, August 15, 2004, through 1.5.7rc02, December 5, 2011, are
|
||||||
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
|
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
|
||||||
distributed according to the same disclaimer and license as libpng-1.2.5
|
distributed according to the same disclaimer and license as libpng-1.2.5
|
||||||
with the following individual added to the list of Contributing Authors
|
with the following individual added to the list of Contributing Authors
|
||||||
@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
|
|||||||
|
|
||||||
Glenn Randers-Pehrson
|
Glenn Randers-Pehrson
|
||||||
glennrp at users.sourceforge.net
|
glennrp at users.sourceforge.net
|
||||||
December 2, 2011
|
December 5, 2011
|
||||||
|
|||||||
2
README
2
README
@ -1,4 +1,4 @@
|
|||||||
README for libpng version 1.5.7rc02 - December 2, 2011 (shared library 15.0)
|
README for libpng version 1.5.7rc02 - December 5, 2011 (shared library 15.0)
|
||||||
See the note about version numbers near the top of png.h
|
See the note about version numbers near the top of png.h
|
||||||
|
|
||||||
See INSTALL for instructions on how to install libpng.
|
See INSTALL for instructions on how to install libpng.
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
libpng-manual.txt - A description on how to use and modify libpng
|
libpng-manual.txt - A description on how to use and modify libpng
|
||||||
|
|
||||||
libpng version 1.5.7rc02 - December 2, 2011
|
libpng version 1.5.7rc02 - December 5, 2011
|
||||||
Updated and distributed by Glenn Randers-Pehrson
|
Updated and distributed by Glenn Randers-Pehrson
|
||||||
<glennrp at users.sourceforge.net>
|
<glennrp at users.sourceforge.net>
|
||||||
Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||||
@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
|
|||||||
|
|
||||||
Based on:
|
Based on:
|
||||||
|
|
||||||
libpng versions 0.97, January 1998, through 1.5.7rc02 - December 2, 2011
|
libpng versions 0.97, January 1998, through 1.5.7rc02 - December 5, 2011
|
||||||
Updated and distributed by Glenn Randers-Pehrson
|
Updated and distributed by Glenn Randers-Pehrson
|
||||||
Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||||
|
|
||||||
@ -4573,7 +4573,7 @@ Other rules can be inferred by inspecting the libpng source.
|
|||||||
|
|
||||||
XIV. Y2K Compliance in libpng
|
XIV. Y2K Compliance in libpng
|
||||||
|
|
||||||
December 2, 2011
|
December 5, 2011
|
||||||
|
|
||||||
Since the PNG Development group is an ad-hoc body, we can't make
|
Since the PNG Development group is an ad-hoc body, we can't make
|
||||||
an official declaration.
|
an official declaration.
|
||||||
|
|||||||
14
libpng.3
14
libpng.3
@ -1,4 +1,4 @@
|
|||||||
.TH LIBPNG 3 "December 2, 2011"
|
.TH LIBPNG 3 "December 5, 2011"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.7rc02
|
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.7rc02
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -977,7 +977,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
|
|||||||
.SH LIBPNG.TXT
|
.SH LIBPNG.TXT
|
||||||
libpng-manual.txt - A description on how to use and modify libpng
|
libpng-manual.txt - A description on how to use and modify libpng
|
||||||
|
|
||||||
libpng version 1.5.7rc02 - December 2, 2011
|
libpng version 1.5.7rc02 - December 5, 2011
|
||||||
Updated and distributed by Glenn Randers-Pehrson
|
Updated and distributed by Glenn Randers-Pehrson
|
||||||
<glennrp at users.sourceforge.net>
|
<glennrp at users.sourceforge.net>
|
||||||
Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||||
@ -988,7 +988,7 @@ libpng-manual.txt - A description on how to use and modify libpng
|
|||||||
|
|
||||||
Based on:
|
Based on:
|
||||||
|
|
||||||
libpng versions 0.97, January 1998, through 1.5.7rc02 - December 2, 2011
|
libpng versions 0.97, January 1998, through 1.5.7rc02 - December 5, 2011
|
||||||
Updated and distributed by Glenn Randers-Pehrson
|
Updated and distributed by Glenn Randers-Pehrson
|
||||||
Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||||
|
|
||||||
@ -5551,7 +5551,7 @@ Other rules can be inferred by inspecting the libpng source.
|
|||||||
|
|
||||||
.SH XIV. Y2K Compliance in libpng
|
.SH XIV. Y2K Compliance in libpng
|
||||||
|
|
||||||
December 2, 2011
|
December 5, 2011
|
||||||
|
|
||||||
Since the PNG Development group is an ad-hoc body, we can't make
|
Since the PNG Development group is an ad-hoc body, we can't make
|
||||||
an official declaration.
|
an official declaration.
|
||||||
@ -5817,7 +5817,7 @@ possible without all of you.
|
|||||||
|
|
||||||
Thanks to Frank J. T. Wojcik for helping with the documentation.
|
Thanks to Frank J. T. Wojcik for helping with the documentation.
|
||||||
|
|
||||||
Libpng version 1.5.7rc02 - December 2, 2011:
|
Libpng version 1.5.7rc02 - December 5, 2011:
|
||||||
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
|
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
|
||||||
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
|
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
|
||||||
|
|
||||||
@ -5840,7 +5840,7 @@ this sentence.
|
|||||||
|
|
||||||
This code is released under the libpng license.
|
This code is released under the libpng license.
|
||||||
|
|
||||||
libpng versions 1.2.6, August 15, 2004, through 1.5.7rc02, December 2, 2011, are
|
libpng versions 1.2.6, August 15, 2004, through 1.5.7rc02, December 5, 2011, are
|
||||||
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
|
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
|
||||||
distributed according to the same disclaimer and license as libpng-1.2.5
|
distributed according to the same disclaimer and license as libpng-1.2.5
|
||||||
with the following individual added to the list of Contributing Authors
|
with the following individual added to the list of Contributing Authors
|
||||||
@ -5939,7 +5939,7 @@ certification mark of the Open Source Initiative.
|
|||||||
|
|
||||||
Glenn Randers-Pehrson
|
Glenn Randers-Pehrson
|
||||||
glennrp at users.sourceforge.net
|
glennrp at users.sourceforge.net
|
||||||
December 2, 2011
|
December 5, 2011
|
||||||
|
|
||||||
.\" end of man page
|
.\" end of man page
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
.TH LIBPNGPF 3 "December 2, 2011"
|
.TH LIBPNGPF 3 "December 5, 2011"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.7rc02
|
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.7rc02
|
||||||
(private functions)
|
(private functions)
|
||||||
|
|||||||
2
png.5
2
png.5
@ -1,4 +1,4 @@
|
|||||||
.TH PNG 5 "December 2, 2011"
|
.TH PNG 5 "December 5, 2011"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
png \- Portable Network Graphics (PNG) format
|
png \- Portable Network Graphics (PNG) format
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
|
|||||||
4
png.c
4
png.c
@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr)
|
|||||||
#else
|
#else
|
||||||
# ifdef __STDC__
|
# ifdef __STDC__
|
||||||
return PNG_STRING_NEWLINE \
|
return PNG_STRING_NEWLINE \
|
||||||
"libpng version 1.5.7rc02 - December 2, 2011" PNG_STRING_NEWLINE \
|
"libpng version 1.5.7rc02 - December 5, 2011" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
"Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
||||||
PNG_STRING_NEWLINE;
|
PNG_STRING_NEWLINE;
|
||||||
# else
|
# else
|
||||||
return "libpng version 1.5.7rc02 - December 2, 2011\
|
return "libpng version 1.5.7rc02 - December 5, 2011\
|
||||||
Copyright (c) 1998-2011 Glenn Randers-Pehrson\
|
Copyright (c) 1998-2011 Glenn Randers-Pehrson\
|
||||||
Copyright (c) 1996-1997 Andreas Dilger\
|
Copyright (c) 1996-1997 Andreas Dilger\
|
||||||
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
|
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
|
||||||
|
|||||||
10
png.h
10
png.h
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* png.h - header file for PNG reference library
|
/* png.h - header file for PNG reference library
|
||||||
*
|
*
|
||||||
* libpng version 1.5.7rc02 - December 2, 2011
|
* libpng version 1.5.7rc02 - December 5, 2011
|
||||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
@ -11,7 +11,7 @@
|
|||||||
* Authors and maintainers:
|
* Authors and maintainers:
|
||||||
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
|
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
|
||||||
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
|
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
|
||||||
* libpng versions 0.97, January 1998, through 1.5.7rc02 - December 2, 2011: Glenn
|
* libpng versions 0.97, January 1998, through 1.5.7rc02 - December 5, 2011: Glenn
|
||||||
* See also "Contributing Authors", below.
|
* See also "Contributing Authors", below.
|
||||||
*
|
*
|
||||||
* Note about libpng version numbers:
|
* Note about libpng version numbers:
|
||||||
@ -196,7 +196,7 @@
|
|||||||
*
|
*
|
||||||
* This code is released under the libpng license.
|
* This code is released under the libpng license.
|
||||||
*
|
*
|
||||||
* libpng versions 1.2.6, August 15, 2004, through 1.5.7rc02, December 2, 2011, are
|
* libpng versions 1.2.6, August 15, 2004, through 1.5.7rc02, December 5, 2011, are
|
||||||
* Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
|
* Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
|
||||||
* distributed according to the same disclaimer and license as libpng-1.2.5
|
* distributed according to the same disclaimer and license as libpng-1.2.5
|
||||||
* with the following individual added to the list of Contributing Authors:
|
* with the following individual added to the list of Contributing Authors:
|
||||||
@ -308,7 +308,7 @@
|
|||||||
* Y2K compliance in libpng:
|
* Y2K compliance in libpng:
|
||||||
* =========================
|
* =========================
|
||||||
*
|
*
|
||||||
* December 2, 2011
|
* December 5, 2011
|
||||||
*
|
*
|
||||||
* Since the PNG Development group is an ad-hoc body, we can't make
|
* Since the PNG Development group is an ad-hoc body, we can't make
|
||||||
* an official declaration.
|
* an official declaration.
|
||||||
@ -374,7 +374,7 @@
|
|||||||
/* Version information for png.h - this should match the version in png.c */
|
/* Version information for png.h - this should match the version in png.c */
|
||||||
#define PNG_LIBPNG_VER_STRING "1.5.7rc02"
|
#define PNG_LIBPNG_VER_STRING "1.5.7rc02"
|
||||||
#define PNG_HEADER_VERSION_STRING \
|
#define PNG_HEADER_VERSION_STRING \
|
||||||
" libpng version 1.5.7rc02 - December 2, 2011\n"
|
" libpng version 1.5.7rc02 - December 5, 2011\n"
|
||||||
|
|
||||||
#define PNG_LIBPNG_VER_SONUM 15
|
#define PNG_LIBPNG_VER_SONUM 15
|
||||||
#define PNG_LIBPNG_VER_DLLNUM 15
|
#define PNG_LIBPNG_VER_DLLNUM 15
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngconf.h - machine configurable file for libpng
|
/* pngconf.h - machine configurable file for libpng
|
||||||
*
|
*
|
||||||
* libpng version 1.5.7rc02 - December 2, 2011
|
* libpng version 1.5.7rc02 - December 5, 2011
|
||||||
*
|
*
|
||||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
|||||||
2
pngset.c
2
pngset.c
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* pngset.c - storage of image information into info struct
|
/* pngset.c - storage of image information into info struct
|
||||||
*
|
*
|
||||||
* Last changed in libpng 1.5.6 [November 3, 2011]
|
* Last changed in libpng 1.5.7 [(PENDING RELEASE)]
|
||||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
|||||||
@ -1,383 +1,383 @@
|
|||||||
40
|
40
|
||||||
targetIdent
|
targetIdent
|
||||||
0
|
0
|
||||||
MProject
|
MProject
|
||||||
1
|
1
|
||||||
MComponent
|
MComponent
|
||||||
0
|
0
|
||||||
2
|
2
|
||||||
WString
|
WString
|
||||||
3
|
3
|
||||||
LIB
|
LIB
|
||||||
3
|
3
|
||||||
WString
|
WString
|
||||||
5
|
5
|
||||||
n_2sn
|
n_2sn
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
0
|
0
|
||||||
4
|
4
|
||||||
MCommand
|
MCommand
|
||||||
0
|
0
|
||||||
5
|
5
|
||||||
MCommand
|
MCommand
|
||||||
0
|
0
|
||||||
6
|
6
|
||||||
MItem
|
MItem
|
||||||
10
|
10
|
||||||
libpng.lib
|
libpng.lib
|
||||||
7
|
7
|
||||||
WString
|
WString
|
||||||
3
|
3
|
||||||
LIB
|
LIB
|
||||||
8
|
8
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
9
|
9
|
||||||
WVList
|
WVList
|
||||||
1
|
1
|
||||||
10
|
10
|
||||||
ActionStates
|
ActionStates
|
||||||
11
|
11
|
||||||
WString
|
WString
|
||||||
5
|
5
|
||||||
&Make
|
&Make
|
||||||
12
|
12
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
-1
|
-1
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
13
|
13
|
||||||
WPickList
|
WPickList
|
||||||
16
|
16
|
||||||
14
|
14
|
||||||
MItem
|
MItem
|
||||||
3
|
3
|
||||||
*.c
|
*.c
|
||||||
15
|
15
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
16
|
16
|
||||||
WVList
|
WVList
|
||||||
2
|
2
|
||||||
17
|
17
|
||||||
MVState
|
MVState
|
||||||
18
|
18
|
||||||
WString
|
WString
|
||||||
3
|
3
|
||||||
WCC
|
WCC
|
||||||
19
|
19
|
||||||
WString
|
WString
|
||||||
25
|
25
|
||||||
n????Include directories:
|
n????Include directories:
|
||||||
1
|
1
|
||||||
20
|
20
|
||||||
WString
|
WString
|
||||||
39
|
39
|
||||||
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
||||||
0
|
0
|
||||||
21
|
21
|
||||||
MVState
|
MVState
|
||||||
22
|
22
|
||||||
WString
|
WString
|
||||||
3
|
3
|
||||||
WCC
|
WCC
|
||||||
23
|
23
|
||||||
WString
|
WString
|
||||||
25
|
25
|
||||||
n????Include directories:
|
n????Include directories:
|
||||||
0
|
0
|
||||||
24
|
24
|
||||||
WString
|
WString
|
||||||
39
|
39
|
||||||
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
||||||
0
|
0
|
||||||
25
|
25
|
||||||
WVList
|
WVList
|
||||||
1
|
1
|
||||||
26
|
26
|
||||||
ActionStates
|
ActionStates
|
||||||
27
|
27
|
||||||
WString
|
WString
|
||||||
5
|
5
|
||||||
&Make
|
&Make
|
||||||
28
|
28
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
-1
|
-1
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
29
|
29
|
||||||
MItem
|
MItem
|
||||||
11
|
11
|
||||||
..\..\png.c
|
..\..\png.c
|
||||||
30
|
30
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
31
|
31
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
32
|
32
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
33
|
33
|
||||||
MItem
|
MItem
|
||||||
16
|
16
|
||||||
..\..\pngerror.c
|
..\..\pngerror.c
|
||||||
34
|
34
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
35
|
35
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
36
|
36
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
37
|
37
|
||||||
MItem
|
MItem
|
||||||
14
|
14
|
||||||
..\..\pngget.c
|
..\..\pngget.c
|
||||||
38
|
38
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
39
|
39
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
40
|
40
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
41
|
41
|
||||||
MItem
|
MItem
|
||||||
14
|
14
|
||||||
..\..\pngmem.c
|
..\..\pngmem.c
|
||||||
42
|
42
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
43
|
43
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
44
|
44
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
45
|
45
|
||||||
MItem
|
MItem
|
||||||
16
|
16
|
||||||
..\..\pngpread.c
|
..\..\pngpread.c
|
||||||
46
|
46
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
47
|
47
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
48
|
48
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
49
|
49
|
||||||
MItem
|
MItem
|
||||||
15
|
15
|
||||||
..\..\pngread.c
|
..\..\pngread.c
|
||||||
50
|
50
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
51
|
51
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
52
|
52
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
53
|
53
|
||||||
MItem
|
MItem
|
||||||
14
|
14
|
||||||
..\..\pngrio.c
|
..\..\pngrio.c
|
||||||
54
|
54
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
55
|
55
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
56
|
56
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
57
|
57
|
||||||
MItem
|
MItem
|
||||||
16
|
16
|
||||||
..\..\pngrtran.c
|
..\..\pngrtran.c
|
||||||
58
|
58
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
59
|
59
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
60
|
60
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
61
|
61
|
||||||
MItem
|
MItem
|
||||||
16
|
16
|
||||||
..\..\pngrutil.c
|
..\..\pngrutil.c
|
||||||
62
|
62
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
63
|
63
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
64
|
64
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
65
|
65
|
||||||
MItem
|
MItem
|
||||||
14
|
14
|
||||||
..\..\pngset.c
|
..\..\pngset.c
|
||||||
66
|
66
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
67
|
67
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
68
|
68
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
69
|
69
|
||||||
MItem
|
MItem
|
||||||
16
|
16
|
||||||
..\..\pngtrans.c
|
..\..\pngtrans.c
|
||||||
70
|
70
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
71
|
71
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
72
|
72
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
73
|
73
|
||||||
MItem
|
MItem
|
||||||
14
|
14
|
||||||
..\..\pngwio.c
|
..\..\pngwio.c
|
||||||
74
|
74
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
75
|
75
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
76
|
76
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
77
|
77
|
||||||
MItem
|
MItem
|
||||||
16
|
16
|
||||||
..\..\pngwrite.c
|
..\..\pngwrite.c
|
||||||
78
|
78
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
79
|
79
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
80
|
80
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
81
|
81
|
||||||
MItem
|
MItem
|
||||||
16
|
16
|
||||||
..\..\pngwtran.c
|
..\..\pngwtran.c
|
||||||
82
|
82
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
83
|
83
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
84
|
84
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
85
|
85
|
||||||
MItem
|
MItem
|
||||||
16
|
16
|
||||||
..\..\pngwutil.c
|
..\..\pngwutil.c
|
||||||
86
|
86
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
87
|
87
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
88
|
88
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
|
|||||||
@ -1,92 +1,92 @@
|
|||||||
40
|
40
|
||||||
projectIdent
|
projectIdent
|
||||||
0
|
0
|
||||||
VpeMain
|
VpeMain
|
||||||
1
|
1
|
||||||
WRect
|
WRect
|
||||||
256
|
256
|
||||||
0
|
0
|
||||||
8960
|
8960
|
||||||
9284
|
9284
|
||||||
2
|
2
|
||||||
MProject
|
MProject
|
||||||
3
|
3
|
||||||
MCommand
|
MCommand
|
||||||
322
|
322
|
||||||
# Locations of zlib and (if required) awk (change as required:)
|
# Locations of zlib and (if required) awk (change as required:)
|
||||||
set zlib=..\..\..\zlib
|
set zlib=..\..\..\zlib
|
||||||
set awk=
|
set awk=
|
||||||
#
|
#
|
||||||
@if not exist pngconfig.dfa $(MAKE) $(__MAKEOPTS__) -f pngconfig.mak defaults
|
@if not exist pngconfig.dfa $(MAKE) $(__MAKEOPTS__) -f pngconfig.mak defaults
|
||||||
@if exist config.inf type config.inf
|
@if exist config.inf type config.inf
|
||||||
@echo Checking for the libpng configuration file pnglibconf.h
|
@echo Checking for the libpng configuration file pnglibconf.h
|
||||||
$(MAKE) $(__MAKEOPTS__) -f pngconfig.mak
|
$(MAKE) $(__MAKEOPTS__) -f pngconfig.mak
|
||||||
4
|
4
|
||||||
MCommand
|
MCommand
|
||||||
19
|
19
|
||||||
@type pngconfig.inf
|
@type pngconfig.inf
|
||||||
3
|
3
|
||||||
5
|
5
|
||||||
WFileName
|
WFileName
|
||||||
10
|
10
|
||||||
libpng.tgt
|
libpng.tgt
|
||||||
6
|
6
|
||||||
WFileName
|
WFileName
|
||||||
11
|
11
|
||||||
pngtest.tgt
|
pngtest.tgt
|
||||||
7
|
7
|
||||||
WFileName
|
WFileName
|
||||||
12
|
12
|
||||||
pngvalid.tgt
|
pngvalid.tgt
|
||||||
8
|
8
|
||||||
WVList
|
WVList
|
||||||
3
|
3
|
||||||
9
|
9
|
||||||
VComponent
|
VComponent
|
||||||
10
|
10
|
||||||
WRect
|
WRect
|
||||||
0
|
0
|
||||||
0
|
0
|
||||||
5632
|
5632
|
||||||
4164
|
4164
|
||||||
0
|
0
|
||||||
0
|
0
|
||||||
11
|
11
|
||||||
WFileName
|
WFileName
|
||||||
10
|
10
|
||||||
libpng.tgt
|
libpng.tgt
|
||||||
0
|
0
|
||||||
0
|
0
|
||||||
12
|
12
|
||||||
VComponent
|
VComponent
|
||||||
13
|
13
|
||||||
WRect
|
WRect
|
||||||
1280
|
1280
|
||||||
1540
|
1540
|
||||||
5632
|
5632
|
||||||
4164
|
4164
|
||||||
0
|
0
|
||||||
0
|
0
|
||||||
14
|
14
|
||||||
WFileName
|
WFileName
|
||||||
11
|
11
|
||||||
pngtest.tgt
|
pngtest.tgt
|
||||||
0
|
0
|
||||||
1
|
1
|
||||||
15
|
15
|
||||||
VComponent
|
VComponent
|
||||||
16
|
16
|
||||||
WRect
|
WRect
|
||||||
518
|
518
|
||||||
487
|
487
|
||||||
5632
|
5632
|
||||||
4164
|
4164
|
||||||
0
|
0
|
||||||
0
|
0
|
||||||
17
|
17
|
||||||
WFileName
|
WFileName
|
||||||
12
|
12
|
||||||
pngvalid.tgt
|
pngvalid.tgt
|
||||||
0
|
0
|
||||||
1
|
1
|
||||||
9
|
9
|
||||||
|
|||||||
@ -1,160 +1,160 @@
|
|||||||
# This is an OpenWatcom make file which builds pnglibconf.h - the libpng
|
# This is an OpenWatcom make file which builds pnglibconf.h - the libpng
|
||||||
# configuration header. You can ignore this file if you don't need to
|
# configuration header. You can ignore this file if you don't need to
|
||||||
# configure libpng; a default configuration will be built.
|
# configure libpng; a default configuration will be built.
|
||||||
#
|
#
|
||||||
# For more information build libpng.wpj under the IDE and then read the
|
# For more information build libpng.wpj under the IDE and then read the
|
||||||
# generated files:
|
# generated files:
|
||||||
#
|
#
|
||||||
# config.inf: Basic configuration information for a standard build.
|
# config.inf: Basic configuration information for a standard build.
|
||||||
# pngconfig.dfa: Advanced configuration for non-standard libpng builds.
|
# pngconfig.dfa: Advanced configuration for non-standard libpng builds.
|
||||||
#
|
#
|
||||||
DELETE=rm -f
|
DELETE=rm -f
|
||||||
ECHO=echo
|
ECHO=echo
|
||||||
COPY=copy
|
COPY=copy
|
||||||
#
|
#
|
||||||
# If your configuration needs to test compiler flags when building
|
# If your configuration needs to test compiler flags when building
|
||||||
# pnglibconf.h you may need to override the following on the wmake command
|
# pnglibconf.h you may need to override the following on the wmake command
|
||||||
# line:
|
# line:
|
||||||
CFLAGS=
|
CFLAGS=
|
||||||
CC=wcl386
|
CC=wcl386
|
||||||
CPP=$(CC) -pw0
|
CPP=$(CC) -pw0
|
||||||
#
|
#
|
||||||
# Read awk from the environment if set, else it can be set on the command
|
# Read awk from the environment if set, else it can be set on the command
|
||||||
# line (the default approach is to set the %awk% environment variable in the
|
# line (the default approach is to set the %awk% environment variable in the
|
||||||
# IDE libpng.wpj 'before' rule - this setting is local.)
|
# IDE libpng.wpj 'before' rule - this setting is local.)
|
||||||
!ifdef %awk
|
!ifdef %awk
|
||||||
AWK=$(%awk)
|
AWK=$(%awk)
|
||||||
!endif
|
!endif
|
||||||
#
|
#
|
||||||
# pnglibconf.h must exist in the source directory, this is the final rule
|
# pnglibconf.h must exist in the source directory, this is the final rule
|
||||||
# which copies the local built version (and this is the default target for
|
# which copies the local built version (and this is the default target for
|
||||||
# this makefile.)
|
# this makefile.)
|
||||||
..\..\pnglibconf.h: pnglibconf.h
|
..\..\pnglibconf.h: pnglibconf.h
|
||||||
$(COPY) pnglibconf.h $@
|
$(COPY) pnglibconf.h $@
|
||||||
|
|
||||||
!ifdef AWK
|
!ifdef AWK
|
||||||
# CPPFLAGS should contain the options to control the result,
|
# CPPFLAGS should contain the options to control the result,
|
||||||
# but DEFS and CFLAGS are also supported here, override
|
# but DEFS and CFLAGS are also supported here, override
|
||||||
# as appropriate
|
# as appropriate
|
||||||
DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS)
|
DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS)
|
||||||
|
|
||||||
pnglibconf.h: pnglibconf.dfn
|
pnglibconf.h: pnglibconf.dfn
|
||||||
$(DELETE) $@ dfn.c dfn1.out dfn2.out
|
$(DELETE) $@ dfn.c dfn1.out dfn2.out
|
||||||
$(ECHO) $#include "pnglibconf.dfn" >dfn.c
|
$(ECHO) $#include "pnglibconf.dfn" >dfn.c
|
||||||
$(CPP) $(DFNFLAGS) dfn.c >dfn1.out
|
$(CPP) $(DFNFLAGS) dfn.c >dfn1.out
|
||||||
$(AWK) -f << dfn1.out >dfn2.out
|
$(AWK) -f << dfn1.out >dfn2.out
|
||||||
/^.*PNG_DEFN_MAGIC-.*-PNG_DEFN_END.*$$/{
|
/^.*PNG_DEFN_MAGIC-.*-PNG_DEFN_END.*$$/{
|
||||||
sub(/^.*PNG_DEFN_MAGIC-/, "")
|
sub(/^.*PNG_DEFN_MAGIC-/, "")
|
||||||
sub(/ *-PNG_DEFN_END.*$$/, "")
|
sub(/ *-PNG_DEFN_END.*$$/, "")
|
||||||
gsub(/ *@@@ */, "")
|
gsub(/ *@@@ */, "")
|
||||||
print
|
print
|
||||||
}
|
}
|
||||||
<<
|
<<
|
||||||
$(COPY) dfn2.out $@
|
$(COPY) dfn2.out $@
|
||||||
@type << >pngconfig.inf
|
@type << >pngconfig.inf
|
||||||
This is a locally configurable build of libpng.lib; for configuration
|
This is a locally configurable build of libpng.lib; for configuration
|
||||||
instructions consult and edit projects/openwatcom/pngconfig.dfa
|
instructions consult and edit projects/openwatcom/pngconfig.dfa
|
||||||
<<
|
<<
|
||||||
$(DELETE) dfn.c dfn1.out dfn2.out
|
$(DELETE) dfn.c dfn1.out dfn2.out
|
||||||
|
|
||||||
pnglibconf.dfn: ..\..\scripts\pnglibconf.dfa ..\..\scripts\options.awk pngconfig.dfa ..\..\pngconf.h
|
pnglibconf.dfn: ..\..\scripts\pnglibconf.dfa ..\..\scripts\options.awk pngconfig.dfa ..\..\pngconf.h
|
||||||
$(DELETE) $@ dfn1.out dfn2.out
|
$(DELETE) $@ dfn1.out dfn2.out
|
||||||
$(AWK) -f ..\..\scripts\options.awk out=dfn1.out version=search ..\..\pngconf.h ..\..\scripts\pnglibconf.dfa pngconfig.dfa $(DFA_XTRA) 1>&2
|
$(AWK) -f ..\..\scripts\options.awk out=dfn1.out version=search ..\..\pngconf.h ..\..\scripts\pnglibconf.dfa pngconfig.dfa $(DFA_XTRA) 1>&2
|
||||||
$(AWK) -f ..\..\scripts\options.awk out=dfn2.out dfn1.out 1>&2
|
$(AWK) -f ..\..\scripts\options.awk out=dfn2.out dfn1.out 1>&2
|
||||||
$(COPY) dfn2.out $@
|
$(COPY) dfn2.out $@
|
||||||
$(DELETE) dfn1.out dfn2.out
|
$(DELETE) dfn1.out dfn2.out
|
||||||
|
|
||||||
!else
|
!else
|
||||||
# The following lines are used to copy scripts\pnglibconf.h.prebuilt and make
|
# The following lines are used to copy scripts\pnglibconf.h.prebuilt and make
|
||||||
# the required change to the calling convention.
|
# the required change to the calling convention.
|
||||||
#
|
#
|
||||||
# By default libpng is built to use the __cdecl calling convention on
|
# By default libpng is built to use the __cdecl calling convention on
|
||||||
# Windows. This gives compatibility with MSVC and GCC. Unfortunately it
|
# Windows. This gives compatibility with MSVC and GCC. Unfortunately it
|
||||||
# does not work with OpenWatcom because OpenWatcom implements longjmp using
|
# does not work with OpenWatcom because OpenWatcom implements longjmp using
|
||||||
# the __watcall convention (compared with both MSVC and GCC which use __cdecl
|
# the __watcall convention (compared with both MSVC and GCC which use __cdecl
|
||||||
# for library functions.)
|
# for library functions.)
|
||||||
#
|
#
|
||||||
# Thus the default must be changed to build on OpenWatcom and, once changed,
|
# Thus the default must be changed to build on OpenWatcom and, once changed,
|
||||||
# the result will not be compatible with applications built using other
|
# the result will not be compatible with applications built using other
|
||||||
# compilers (in fact attempts to build will fail at compile time.)
|
# compilers (in fact attempts to build will fail at compile time.)
|
||||||
#
|
#
|
||||||
pnglibconf.h: ..\..\scripts\pnglibconf.h.prebuilt .existsonly
|
pnglibconf.h: ..\..\scripts\pnglibconf.h.prebuilt .existsonly
|
||||||
@$(ECHO) .
|
@$(ECHO) .
|
||||||
@$(ECHO) .
|
@$(ECHO) .
|
||||||
@$(ECHO) $$(AWK) NOT AVAILABLE: COPYING scripts\pnglibconf.h.prebuilt
|
@$(ECHO) $$(AWK) NOT AVAILABLE: COPYING scripts\pnglibconf.h.prebuilt
|
||||||
@$(ECHO) .
|
@$(ECHO) .
|
||||||
@$(ECHO) .
|
@$(ECHO) .
|
||||||
vi -q -k ":1,$$s/PNG_API_RULE 0$$/PNG_API_RULE 2/\n:w! $@\n:q!\n" ..\..\scripts\pnglibconf.h.prebuilt
|
vi -q -k ":1,$$s/PNG_API_RULE 0$$/PNG_API_RULE 2/\n:w! $@\n:q!\n" ..\..\scripts\pnglibconf.h.prebuilt
|
||||||
@$(ECHO) .
|
@$(ECHO) .
|
||||||
@$(ECHO) .
|
@$(ECHO) .
|
||||||
@$(ECHO) YOU HAVE A DEFAULT CONFIGURATION BECAUSE YOU DO NOT HAVE AWK!
|
@$(ECHO) YOU HAVE A DEFAULT CONFIGURATION BECAUSE YOU DO NOT HAVE AWK!
|
||||||
@$(ECHO) .
|
@$(ECHO) .
|
||||||
@$(ECHO) .
|
@$(ECHO) .
|
||||||
@type << >pngconfig.inf
|
@type << >pngconfig.inf
|
||||||
This is the default configuration of libpng.lib, if you wish to
|
This is the default configuration of libpng.lib, if you wish to
|
||||||
change the configuration please consult the instructions in
|
change the configuration please consult the instructions in
|
||||||
projects/owatcom/pngconfig.dfa.
|
projects/owatcom/pngconfig.dfa.
|
||||||
<<
|
<<
|
||||||
|
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
# Make the default files
|
# Make the default files
|
||||||
defaults: .symbolic
|
defaults: .symbolic
|
||||||
@$(COPY) << config.inf
|
@$(COPY) << config.inf
|
||||||
$# The libpng project is incompletely configured. To complete configuration
|
$# The libpng project is incompletely configured. To complete configuration
|
||||||
$# please complete the following steps:
|
$# please complete the following steps:
|
||||||
$#
|
$#
|
||||||
$# 1) Edit the 'before' rule of libpng.wpj (from the IDE) to define the
|
$# 1) Edit the 'before' rule of libpng.wpj (from the IDE) to define the
|
||||||
$# locations of the zlib include file zlib.h and the built zlib library,
|
$# locations of the zlib include file zlib.h and the built zlib library,
|
||||||
$# zlib.lib.
|
$# zlib.lib.
|
||||||
$#
|
$#
|
||||||
$# 2) If you want to change libpng to a non-standard configuration also
|
$# 2) If you want to change libpng to a non-standard configuration also
|
||||||
$# change the definition of 'awk' in the before rule to the name of your
|
$# change the definition of 'awk' in the before rule to the name of your
|
||||||
$# awk command. For more instructions on configuration read
|
$# awk command. For more instructions on configuration read
|
||||||
$# pngconfig.dfa.
|
$# pngconfig.dfa.
|
||||||
$#
|
$#
|
||||||
$# 3) Delete this file (config.inf).
|
$# 3) Delete this file (config.inf).
|
||||||
<<
|
<<
|
||||||
@$(COPY) << pngconfig.dfa
|
@$(COPY) << pngconfig.dfa
|
||||||
$# pngconfig.dfa: this file contains configuration options for libpng.
|
$# pngconfig.dfa: this file contains configuration options for libpng.
|
||||||
$# If emtpy the standard configuration will be built. For this file to be
|
$# If emtpy the standard configuration will be built. For this file to be
|
||||||
$# used a working version of the program 'awk' is required and the program
|
$# used a working version of the program 'awk' is required and the program
|
||||||
$# must be identified in the 'before' rule of the project.
|
$# must be identified in the 'before' rule of the project.
|
||||||
$#
|
$#
|
||||||
$# If you don't already have 'awk', or the version of awk you have seems not
|
$# If you don't already have 'awk', or the version of awk you have seems not
|
||||||
$# to work, download Brian Kernighan's awk (Brian Kernighan is the author of
|
$# to work, download Brian Kernighan's awk (Brian Kernighan is the author of
|
||||||
$# awk.) You can find source code and a built executable (called awk95.exe)
|
$# awk.) You can find source code and a built executable (called awk95.exe)
|
||||||
$# here:
|
$# here:
|
||||||
$#
|
$#
|
||||||
$# http://www.cs.princeton.edu/~bwk/btl.mirror/
|
$# http://www.cs.princeton.edu/~bwk/btl.mirror/
|
||||||
$#
|
$#
|
||||||
$# The executable works just fine.
|
$# The executable works just fine.
|
||||||
$#
|
$#
|
||||||
$# If build issues errors after a change to pngconfig.dfa you have entered
|
$# If build issues errors after a change to pngconfig.dfa you have entered
|
||||||
$# inconsistent feature requests, or even malformed requests, in
|
$# inconsistent feature requests, or even malformed requests, in
|
||||||
$# pngconfig.dfa. The error messages from awk should be comprehensible, but
|
$# pngconfig.dfa. The error messages from awk should be comprehensible, but
|
||||||
$# if not simply go back to the start (nothing but comments in this file) and
|
$# if not simply go back to the start (nothing but comments in this file) and
|
||||||
$# enter configuration lines one by one until one produces an error. (Or, of
|
$# enter configuration lines one by one until one produces an error. (Or, of
|
||||||
$# course, do the standard binary chop.)
|
$# course, do the standard binary chop.)
|
||||||
$#
|
$#
|
||||||
$# You need to rebuild everything after a change to pnglibconf.dfa - i.e. you
|
$# You need to rebuild everything after a change to pnglibconf.dfa - i.e. you
|
||||||
$# must do Actions/Mark All Targets for Remake. This is because the compiler
|
$# must do Actions/Mark All Targets for Remake. This is because the compiler
|
||||||
$# generated dependency information (as of OpenWatcom 1.9) does not record the
|
$# generated dependency information (as of OpenWatcom 1.9) does not record the
|
||||||
$# dependency on pnglibconf.h correctly.
|
$# dependency on pnglibconf.h correctly.
|
||||||
$#
|
$#
|
||||||
$# If awk isn't set then this file is bypassed. If you just want the standard
|
$# If awk isn't set then this file is bypassed. If you just want the standard
|
||||||
$# configuration it is automatically produced from the distributed version
|
$# configuration it is automatically produced from the distributed version
|
||||||
$# (scripts\pnglibconf.h.prebuilt) by editting PNG_API_RULE to 2 (to force use
|
$# (scripts\pnglibconf.h.prebuilt) by editting PNG_API_RULE to 2 (to force use
|
||||||
$# of the OpenWatcom library calling convention.)
|
$# of the OpenWatcom library calling convention.)
|
||||||
$#
|
$#
|
||||||
<<
|
<<
|
||||||
|
|
||||||
clean:: .symbolic
|
clean:: .symbolic
|
||||||
$(DELETE) ..\..\pnglibconf.h pnglibconf.* dfn.c *.out pngconfig.inf
|
$(DELETE) ..\..\pnglibconf.h pnglibconf.* dfn.c *.out pngconfig.inf
|
||||||
$(DELETE) *.obj *.mbr *.sym *.err *.pch libpng.mk
|
$(DELETE) *.obj *.mbr *.sym *.err *.pch libpng.mk
|
||||||
$(DELETE) libpng.lib libpng.lbr libpng.lb1 libpng.cbr libpng.mk1
|
$(DELETE) libpng.lib libpng.lbr libpng.lb1 libpng.cbr libpng.mk1
|
||||||
$(DELETE) pngtest.exe pngtest.map pngtest.lk1 pngtest.mk1
|
$(DELETE) pngtest.exe pngtest.map pngtest.lk1 pngtest.mk1
|
||||||
$(DELETE) pngvalid.exe pngvalid.map pngvalid.lk1 pngvalid.mk1
|
$(DELETE) pngvalid.exe pngvalid.map pngvalid.lk1 pngvalid.mk1
|
||||||
|
|
||||||
distclean:: clean .symbolic
|
distclean:: clean .symbolic
|
||||||
$(DELETE) zlib.inf awk.inf config.inf pngconfig.dfa
|
$(DELETE) zlib.inf awk.inf config.inf pngconfig.dfa
|
||||||
|
|||||||
@ -1,179 +1,179 @@
|
|||||||
40
|
40
|
||||||
targetIdent
|
targetIdent
|
||||||
0
|
0
|
||||||
MProject
|
MProject
|
||||||
1
|
1
|
||||||
MComponent
|
MComponent
|
||||||
0
|
0
|
||||||
2
|
2
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
NEXE
|
NEXE
|
||||||
3
|
3
|
||||||
WString
|
WString
|
||||||
5
|
5
|
||||||
nc2en
|
nc2en
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
0
|
0
|
||||||
4
|
4
|
||||||
MCommand
|
MCommand
|
||||||
0
|
0
|
||||||
5
|
5
|
||||||
MCommand
|
MCommand
|
||||||
34
|
34
|
||||||
cd ..\..
|
cd ..\..
|
||||||
projects\owatcom\pngtest
|
projects\owatcom\pngtest
|
||||||
6
|
6
|
||||||
MItem
|
MItem
|
||||||
11
|
11
|
||||||
pngtest.exe
|
pngtest.exe
|
||||||
7
|
7
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
NEXE
|
NEXE
|
||||||
8
|
8
|
||||||
WVList
|
WVList
|
||||||
4
|
4
|
||||||
9
|
9
|
||||||
MVState
|
MVState
|
||||||
10
|
10
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
11
|
11
|
||||||
WString
|
WString
|
||||||
28
|
28
|
||||||
?????Library directories(;):
|
?????Library directories(;):
|
||||||
1
|
1
|
||||||
12
|
12
|
||||||
WString
|
WString
|
||||||
8
|
8
|
||||||
$(%zlib)
|
$(%zlib)
|
||||||
0
|
0
|
||||||
13
|
13
|
||||||
MVState
|
MVState
|
||||||
14
|
14
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
15
|
15
|
||||||
WString
|
WString
|
||||||
18
|
18
|
||||||
?????Libraries(,):
|
?????Libraries(,):
|
||||||
1
|
1
|
||||||
16
|
16
|
||||||
WString
|
WString
|
||||||
19
|
19
|
||||||
libpng.lib zlib.lib
|
libpng.lib zlib.lib
|
||||||
0
|
0
|
||||||
17
|
17
|
||||||
MVState
|
MVState
|
||||||
18
|
18
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
19
|
19
|
||||||
WString
|
WString
|
||||||
28
|
28
|
||||||
?????Library directories(;):
|
?????Library directories(;):
|
||||||
0
|
0
|
||||||
20
|
20
|
||||||
WString
|
WString
|
||||||
8
|
8
|
||||||
$(%zlib)
|
$(%zlib)
|
||||||
0
|
0
|
||||||
21
|
21
|
||||||
MVState
|
MVState
|
||||||
22
|
22
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
23
|
23
|
||||||
WString
|
WString
|
||||||
18
|
18
|
||||||
?????Libraries(,):
|
?????Libraries(,):
|
||||||
0
|
0
|
||||||
24
|
24
|
||||||
WString
|
WString
|
||||||
19
|
19
|
||||||
libpng.lib zlib.lib
|
libpng.lib zlib.lib
|
||||||
0
|
0
|
||||||
25
|
25
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
-1
|
-1
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
26
|
26
|
||||||
WPickList
|
WPickList
|
||||||
2
|
2
|
||||||
27
|
27
|
||||||
MItem
|
MItem
|
||||||
3
|
3
|
||||||
*.c
|
*.c
|
||||||
28
|
28
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
29
|
29
|
||||||
WVList
|
WVList
|
||||||
2
|
2
|
||||||
30
|
30
|
||||||
MVState
|
MVState
|
||||||
31
|
31
|
||||||
WString
|
WString
|
||||||
3
|
3
|
||||||
WCC
|
WCC
|
||||||
32
|
32
|
||||||
WString
|
WString
|
||||||
25
|
25
|
||||||
n????Include directories:
|
n????Include directories:
|
||||||
1
|
1
|
||||||
33
|
33
|
||||||
WString
|
WString
|
||||||
39
|
39
|
||||||
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
||||||
0
|
0
|
||||||
34
|
34
|
||||||
MVState
|
MVState
|
||||||
35
|
35
|
||||||
WString
|
WString
|
||||||
3
|
3
|
||||||
WCC
|
WCC
|
||||||
36
|
36
|
||||||
WString
|
WString
|
||||||
25
|
25
|
||||||
n????Include directories:
|
n????Include directories:
|
||||||
0
|
0
|
||||||
37
|
37
|
||||||
WString
|
WString
|
||||||
39
|
39
|
||||||
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
||||||
0
|
0
|
||||||
38
|
38
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
-1
|
-1
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
39
|
39
|
||||||
MItem
|
MItem
|
||||||
15
|
15
|
||||||
..\..\pngtest.c
|
..\..\pngtest.c
|
||||||
40
|
40
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
41
|
41
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
42
|
42
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
27
|
27
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
|
|||||||
@ -1,210 +1,210 @@
|
|||||||
40
|
40
|
||||||
targetIdent
|
targetIdent
|
||||||
0
|
0
|
||||||
MProject
|
MProject
|
||||||
1
|
1
|
||||||
MComponent
|
MComponent
|
||||||
0
|
0
|
||||||
2
|
2
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
NEXE
|
NEXE
|
||||||
3
|
3
|
||||||
WString
|
WString
|
||||||
5
|
5
|
||||||
nc2en
|
nc2en
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
0
|
0
|
||||||
4
|
4
|
||||||
MCommand
|
MCommand
|
||||||
0
|
0
|
||||||
5
|
5
|
||||||
MCommand
|
MCommand
|
||||||
8
|
8
|
||||||
pngvalid
|
pngvalid
|
||||||
6
|
6
|
||||||
MItem
|
MItem
|
||||||
12
|
12
|
||||||
pngvalid.exe
|
pngvalid.exe
|
||||||
7
|
7
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
NEXE
|
NEXE
|
||||||
8
|
8
|
||||||
WVList
|
WVList
|
||||||
6
|
6
|
||||||
9
|
9
|
||||||
MVState
|
MVState
|
||||||
10
|
10
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
11
|
11
|
||||||
WString
|
WString
|
||||||
11
|
11
|
||||||
?????Stack:
|
?????Stack:
|
||||||
1
|
1
|
||||||
12
|
12
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
768k
|
768k
|
||||||
0
|
0
|
||||||
13
|
13
|
||||||
MVState
|
MVState
|
||||||
14
|
14
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
15
|
15
|
||||||
WString
|
WString
|
||||||
28
|
28
|
||||||
?????Library directories(;):
|
?????Library directories(;):
|
||||||
1
|
1
|
||||||
16
|
16
|
||||||
WString
|
WString
|
||||||
8
|
8
|
||||||
$(%zlib)
|
$(%zlib)
|
||||||
0
|
0
|
||||||
17
|
17
|
||||||
MVState
|
MVState
|
||||||
18
|
18
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
19
|
19
|
||||||
WString
|
WString
|
||||||
18
|
18
|
||||||
?????Libraries(,):
|
?????Libraries(,):
|
||||||
1
|
1
|
||||||
20
|
20
|
||||||
WString
|
WString
|
||||||
19
|
19
|
||||||
libpng.lib zlib.lib
|
libpng.lib zlib.lib
|
||||||
0
|
0
|
||||||
21
|
21
|
||||||
MVState
|
MVState
|
||||||
22
|
22
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
23
|
23
|
||||||
WString
|
WString
|
||||||
11
|
11
|
||||||
?????Stack:
|
?????Stack:
|
||||||
0
|
0
|
||||||
24
|
24
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
768k
|
768k
|
||||||
0
|
0
|
||||||
25
|
25
|
||||||
MVState
|
MVState
|
||||||
26
|
26
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
27
|
27
|
||||||
WString
|
WString
|
||||||
28
|
28
|
||||||
?????Library directories(;):
|
?????Library directories(;):
|
||||||
0
|
0
|
||||||
28
|
28
|
||||||
WString
|
WString
|
||||||
8
|
8
|
||||||
$(%zlib)
|
$(%zlib)
|
||||||
0
|
0
|
||||||
29
|
29
|
||||||
MVState
|
MVState
|
||||||
30
|
30
|
||||||
WString
|
WString
|
||||||
7
|
7
|
||||||
WINLINK
|
WINLINK
|
||||||
31
|
31
|
||||||
WString
|
WString
|
||||||
18
|
18
|
||||||
?????Libraries(,):
|
?????Libraries(,):
|
||||||
0
|
0
|
||||||
32
|
32
|
||||||
WString
|
WString
|
||||||
19
|
19
|
||||||
libpng.lib zlib.lib
|
libpng.lib zlib.lib
|
||||||
0
|
0
|
||||||
33
|
33
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
-1
|
-1
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
34
|
34
|
||||||
WPickList
|
WPickList
|
||||||
2
|
2
|
||||||
35
|
35
|
||||||
MItem
|
MItem
|
||||||
3
|
3
|
||||||
*.c
|
*.c
|
||||||
36
|
36
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
37
|
37
|
||||||
WVList
|
WVList
|
||||||
2
|
2
|
||||||
38
|
38
|
||||||
MVState
|
MVState
|
||||||
39
|
39
|
||||||
WString
|
WString
|
||||||
3
|
3
|
||||||
WCC
|
WCC
|
||||||
40
|
40
|
||||||
WString
|
WString
|
||||||
25
|
25
|
||||||
n????Include directories:
|
n????Include directories:
|
||||||
1
|
1
|
||||||
41
|
41
|
||||||
WString
|
WString
|
||||||
39
|
39
|
||||||
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
||||||
0
|
0
|
||||||
42
|
42
|
||||||
MVState
|
MVState
|
||||||
43
|
43
|
||||||
WString
|
WString
|
||||||
3
|
3
|
||||||
WCC
|
WCC
|
||||||
44
|
44
|
||||||
WString
|
WString
|
||||||
25
|
25
|
||||||
n????Include directories:
|
n????Include directories:
|
||||||
0
|
0
|
||||||
45
|
45
|
||||||
WString
|
WString
|
||||||
39
|
39
|
||||||
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
|
||||||
0
|
0
|
||||||
46
|
46
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
-1
|
-1
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
47
|
47
|
||||||
MItem
|
MItem
|
||||||
33
|
33
|
||||||
..\..\contrib\libtests\pngvalid.c
|
..\..\contrib\libtests\pngvalid.c
|
||||||
48
|
48
|
||||||
WString
|
WString
|
||||||
4
|
4
|
||||||
COBJ
|
COBJ
|
||||||
49
|
49
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
50
|
50
|
||||||
WVList
|
WVList
|
||||||
0
|
0
|
||||||
35
|
35
|
||||||
1
|
1
|
||||||
1
|
1
|
||||||
0
|
0
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
VisualStudio instructions
|
VisualStudio instructions
|
||||||
|
|
||||||
libpng version 1.5.7rc02 - December 2, 2011
|
libpng version 1.5.7rc02 - December 5, 2011
|
||||||
|
|
||||||
Copyright (c) 1998-2010 Glenn Randers-Pehrson
|
Copyright (c) 1998-2010 Glenn Randers-Pehrson
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* zlib.props - location of zlib source
|
* zlib.props - location of zlib source
|
||||||
*
|
*
|
||||||
* libpng version 1.5.7rc02 - December 2, 2011
|
* libpng version 1.5.7rc02 - December 5, 2011
|
||||||
*
|
*
|
||||||
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
|
||||||
*
|
*
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Makefiles for libpng version 1.5.7rc02 - December 2, 2011
|
Makefiles for libpng version 1.5.7rc02 - December 5, 2011
|
||||||
|
|
||||||
pnglibconf.h.prebuilt => Stores configuration settings
|
pnglibconf.h.prebuilt => Stores configuration settings
|
||||||
makefile.linux => Linux/ELF makefile
|
makefile.linux => Linux/ELF makefile
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/* pnglibconf.h - library build configuration */
|
/* pnglibconf.h - library build configuration */
|
||||||
|
|
||||||
/* Libpng 1.5.7rc02 - December 2, 2011 */
|
/* Libpng 1.5.7rc02 - December 5, 2011 */
|
||||||
|
|
||||||
/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
|
/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user