aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-01-13 18:54:10 +1000
committerDavid Walter Seikel2013-01-13 18:54:10 +1000
commit959831f4ef5a3e797f576c3de08cd65032c997ad (patch)
treee7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim
parentAdd info about changes to Irrlicht. (diff)
downloadSledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip
SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz
SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2
SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to 'libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim')
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/README20
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/makefile300
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.dfa78
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.h48
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README20
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile298
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa70
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h48
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/README30
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/makefile330
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.dfa80
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.h48
12 files changed, 685 insertions, 685 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/README b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/README
index 86583cc..fa979fc 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/README
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/README
@@ -1,10 +1,10 @@
1This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa 1This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa
2 2
3The makefile builds a minimal read-only decoder with embedded libpng 3The makefile builds a minimal read-only decoder with embedded libpng
4and zlib. 4and zlib.
5 5
6Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC 6Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
7on the make command line. 7on the make command line.
8 8
9If you prefer to use the shared libraries, go to contrib/pngminus 9If you prefer to use the shared libraries, go to contrib/pngminus
10and build the png2pnm application there. 10and build the png2pnm application there.
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/makefile b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/makefile
index 9692e0a..e10e122 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/makefile
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/makefile
@@ -1,150 +1,150 @@
1# Makefile for PngMinus (pngm2pnm) 1# Makefile for PngMinus (pngm2pnm)
2# Linux / Unix 2# Linux / Unix
3 3
4#CC=cc 4#CC=cc
5CC=gcc 5CC=gcc
6LD=$(CC) 6LD=$(CC)
7 7
8# If awk fails try 8# If awk fails try
9# make AWK=nawk 9# make AWK=nawk
10 10
11# If cpp fails try 11# If cpp fails try
12# make CPP=/lib/cpp 12# make CPP=/lib/cpp
13 13
14RM=rm -f 14RM=rm -f
15COPY=cp 15COPY=cp
16 16
17CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. -O1 17CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. -O1
18 18
19C=.c 19C=.c
20O=.o 20O=.o
21L=.a 21L=.a
22E= 22E=
23 23
24# Where to find the source code: 24# Where to find the source code:
25PNGSRC =../../.. 25PNGSRC =../../..
26ZLIBSRC=$(PNGSRC)/../zlib 26ZLIBSRC=$(PNGSRC)/../zlib
27PROGSRC=$(PNGSRC)/contrib/pngminus 27PROGSRC=$(PNGSRC)/contrib/pngminus
28 28
29# Zlib (minimal inflate requirements - crc32 is used by libpng) 29# Zlib (minimal inflate requirements - crc32 is used by libpng)
30# zutil can be eliminated if you provide your own zcalloc and zcfree 30# zutil can be eliminated if you provide your own zcalloc and zcfree
31ZSRCS = adler32$(C) crc32$(C) \ 31ZSRCS = adler32$(C) crc32$(C) \
32 inffast$(C) inflate$(C) inftrees$(C) \ 32 inffast$(C) inflate$(C) inftrees$(C) \
33 zutil$(C) 33 zutil$(C)
34 34
35# Standard headers 35# Standard headers
36ZH = zlib.h crc32.h inffast.h inffixed.h \ 36ZH = zlib.h crc32.h inffast.h inffixed.h \
37 inflate.h inftrees.h zutil.h 37 inflate.h inftrees.h zutil.h
38 38
39# Machine generated headers 39# Machine generated headers
40ZCONF = zconf.h 40ZCONF = zconf.h
41 41
42# Headers callers use 42# Headers callers use
43ZINC = zlib.h $(ZCONF) 43ZINC = zlib.h $(ZCONF)
44 44
45# Headers the Zlib source uses 45# Headers the Zlib source uses
46ZHDRS = $(ZH) $(ZCONF) 46ZHDRS = $(ZH) $(ZCONF)
47 47
48ZOBJS = adler32$(O) crc32$(O) \ 48ZOBJS = adler32$(O) crc32$(O) \
49 inffast$(O) inflate$(O) inftrees$(O) \ 49 inffast$(O) inflate$(O) inftrees$(O) \
50 zutil$(O) 50 zutil$(O)
51 51
52# libpng 52# libpng
53PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \ 53PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
54 pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \ 54 pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \
55 pngset$(C) pngtrans$(C) 55 pngset$(C) pngtrans$(C)
56 56
57# Standard headers 57# Standard headers
58PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h 58PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
59 59
60# Machine generated headers 60# Machine generated headers
61PNGCONF=pnglibconf.h 61PNGCONF=pnglibconf.h
62 62
63# Headers callers use 63# Headers callers use
64PNGINC= png.h pngconf.h pngusr.h $(PNGCONF) 64PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
65 65
66# Headers the PNG library uses 66# Headers the PNG library uses
67PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h 67PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
68 68
69PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ 69PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
70 pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \ 70 pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
71 pngset$(O) pngtrans$(O) 71 pngset$(O) pngtrans$(O)
72 72
73PROGSRCS= pngm2pnm$(C) 73PROGSRCS= pngm2pnm$(C)
74PROGHDRS= 74PROGHDRS=
75PROGDOCS= 75PROGDOCS=
76PROGOBJS= pngm2pnm$(O) 76PROGOBJS= pngm2pnm$(O)
77 77
78OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) 78OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
79 79
80# implicit make rules ------------------------------------------------------- 80# implicit make rules -------------------------------------------------------
81 81
82# note: dependencies do not work on implicit rule lines 82# note: dependencies do not work on implicit rule lines
83.c$(O): 83.c$(O):
84 $(CC) -c $(CFLAGS) $< 84 $(CC) -c $(CFLAGS) $<
85 85
86# dependencies 86# dependencies
87 87
88all: pngm2pnm$(E) 88all: pngm2pnm$(E)
89 89
90pngm2pnm$(E): $(OBJS) 90pngm2pnm$(E): $(OBJS)
91 $(LD) -o pngm2pnm$(E) $(OBJS) 91 $(LD) -o pngm2pnm$(E) $(OBJS)
92 92
93# The DFA_XTRA setting turns all libpng options off then 93# The DFA_XTRA setting turns all libpng options off then
94# turns on those required for this minimal build. 94# turns on those required for this minimal build.
95# The CPP_FLAGS setting causes pngusr.h to be included in 95# The CPP_FLAGS setting causes pngusr.h to be included in
96# both the build of pnglibconf.h and, subsequently, when 96# both the build of pnglibconf.h and, subsequently, when
97# building libpng itself. 97# building libpng itself.
98$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\ 98$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\
99 $(PNGSRC)/scripts/pnglibconf.dfa \ 99 $(PNGSRC)/scripts/pnglibconf.dfa \
100 $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa 100 $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
101 $(RM) pnglibconf.h pnglibconf.dfn 101 $(RM) pnglibconf.h pnglibconf.dfn
102 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ 102 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
103 srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\ 103 srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\
104 DFA_XTRA="pngusr.dfa" $@ 104 DFA_XTRA="pngusr.dfa" $@
105 105
106clean: 106clean:
107 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ 107 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
108 srcdir=$(PNGSRC) clean 108 srcdir=$(PNGSRC) clean
109 $(RM) pngm2pnm$(O) 109 $(RM) pngm2pnm$(O)
110 $(RM) pngm2pnm$(E) 110 $(RM) pngm2pnm$(E)
111 $(RM) $(OBJS) 111 $(RM) $(OBJS)
112 112
113# distclean also removes the copied source and headers 113# distclean also removes the copied source and headers
114distclean: clean 114distclean: clean
115 $(RM) -r scripts # historical reasons 115 $(RM) -r scripts # historical reasons
116 $(RM) $(PNGSRCS) $(PNGH) 116 $(RM) $(PNGSRCS) $(PNGH)
117 $(RM) $(ZSRCS) $(ZH) $(ZCONF) 117 $(RM) $(ZSRCS) $(ZH) $(ZCONF)
118 $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS) 118 $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
119 119
120# Header file dependencies: 120# Header file dependencies:
121$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC) 121$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
122$(PNGOBJS): $(PNGHDRS) $(ZINC) 122$(PNGOBJS): $(PNGHDRS) $(ZINC)
123$(ZOBJS): $(ZHDRS) 123$(ZOBJS): $(ZHDRS)
124 124
125# Gather the source code from the respective directories 125# Gather the source code from the respective directories
126$(PNGSRCS) $(PNGH): $(PNGSRC)/$@ 126$(PNGSRCS) $(PNGH): $(PNGSRC)/$@
127 $(RM) $@ 127 $(RM) $@
128 $(COPY) $(PNGSRC)/$@ $@ 128 $(COPY) $(PNGSRC)/$@ $@
129 129
130# No dependency on the ZLIBSRC target so that it only needs 130# No dependency on the ZLIBSRC target so that it only needs
131# to be specified once. 131# to be specified once.
132$(ZSRCS) $(ZH): 132$(ZSRCS) $(ZH):
133 $(RM) $@ 133 $(RM) $@
134 $(COPY) $(ZLIBSRC)/$@ $@ 134 $(COPY) $(ZLIBSRC)/$@ $@
135 135
136# The unconfigured zconf.h varies in name according to the 136# The unconfigured zconf.h varies in name according to the
137# zlib release 137# zlib release
138$(ZCONF): 138$(ZCONF):
139 $(RM) $@ 139 $(RM) $@
140 @for f in zconf.h.in zconf.in.h zconf.h; do\ 140 @for f in zconf.h.in zconf.in.h zconf.h; do\
141 test -r $(ZLIBSRC)/$$f &&\ 141 test -r $(ZLIBSRC)/$$f &&\
142 echo $(COPY) $(ZLIBSRC)/$$f $@ &&\ 142 echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
143 $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\ 143 $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
144 done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1 144 done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
145 145
146pngm2pnm.c: $(PROGSRC)/png2pnm.c 146pngm2pnm.c: $(PROGSRC)/png2pnm.c
147 $(RM) $@ 147 $(RM) $@
148 $(COPY) $(PROGSRC)/png2pnm.c $@ 148 $(COPY) $(PROGSRC)/png2pnm.c $@
149 149
150# End of makefile for pngm2pnm 150# End of makefile for pngm2pnm
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.dfa b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.dfa
index 8a66d64..70d528b 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.dfa
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.dfa
@@ -1,39 +1,39 @@
1# pngminim/decoder/pngusr.dfa 1# pngminim/decoder/pngusr.dfa
2# 2#
3# Copyright (c) 2010-2011 Glenn Randers-Pehrson 3# Copyright (c) 2010-2011 Glenn Randers-Pehrson
4# 4#
5# This code is released under the libpng license. 5# This code is released under the libpng license.
6# For conditions of distribution and use, see the disclaimer 6# For conditions of distribution and use, see the disclaimer
7# and license in png.h 7# and license in png.h
8 8
9# First all the build options off: 9# First all the build options off:
10 10
11everything = off 11everything = off
12 12
13# All that is required is some read code. This example switches 13# All that is required is some read code. This example switches
14# on the sequential read code (see ../preader for a progressive 14# on the sequential read code (see ../preader for a progressive
15# read example). 15# read example).
16 16
17option SEQUENTIAL_READ on 17option SEQUENTIAL_READ on
18 18
19# You must choose fixed or floating point arithmetic: 19# You must choose fixed or floating point arithmetic:
20# option FLOATING_POINT on 20# option FLOATING_POINT on
21 21
22option FIXED_POINT on 22option FIXED_POINT on
23 23
24# You must chose the internal fixed point implementation or to 24# You must chose the internal fixed point implementation or to
25# use the system floating point. The latter is considerably 25# use the system floating point. The latter is considerably
26# smaller (by about 1kbyte on an x86 system): 26# smaller (by about 1kbyte on an x86 system):
27# option FLOATING_ARITHMETIC on 27# option FLOATING_ARITHMETIC on
28 28
29option FLOATING_ARITHMETIC off 29option FLOATING_ARITHMETIC off
30 30
31# Your program will probably need other options. The example 31# Your program will probably need other options. The example
32# program here, pngm2pnm, requires the following. Take a look 32# program here, pngm2pnm, requires the following. Take a look
33# at pnglibconf.h to find out the full set of what has to be 33# at pnglibconf.h to find out the full set of what has to be
34# enabled to make the following work. 34# enabled to make the following work.
35 35
36option SETJMP on 36option SETJMP on
37option STDIO on 37option STDIO on
38option READ_EXPAND on 38option READ_EXPAND on
39option READ_STRIP_16_TO_8 on 39option READ_STRIP_16_TO_8 on
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.h b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.h
index 2991c17..9d9c50c 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.h
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/decoder/pngusr.h
@@ -1,24 +1,24 @@
1/* minrdpngconf.h: headers to make a minimal png-read-only library 1/* minrdpngconf.h: headers to make a minimal png-read-only library
2 * 2 *
3 * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson 3 * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson
4 * 4 *
5 * This code is released under the libpng license. 5 * This code is released under the libpng license.
6 * For conditions of distribution and use, see the disclaimer 6 * For conditions of distribution and use, see the disclaimer
7 * and license in png.h 7 * and license in png.h
8 * 8 *
9 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson 9 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
10 */ 10 */
11 11
12#ifndef MINRDPNGCONF_H 12#ifndef MINRDPNGCONF_H
13#define MINRDPNGCONF_H 13#define MINRDPNGCONF_H
14 14
15/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */ 15/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
16 16
17/* List options to turn off features of the build that do not 17/* List options to turn off features of the build that do not
18 * affect the API (so are not recorded in pnglibconf.h) 18 * affect the API (so are not recorded in pnglibconf.h)
19 */ 19 */
20 20
21#define PNG_NO_WARNINGS 21#define PNG_NO_WARNINGS
22#define PNG_ALIGN_TYPE PNG_ALIGN_NONE 22#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
23 23
24#endif /* MINRDPNGCONF_H */ 24#endif /* MINRDPNGCONF_H */
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README
index f8a8b6d..ff9aa45 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README
@@ -1,10 +1,10 @@
1This demonstrates the use of PNG_USER_CONFIG and pngusr.h 1This demonstrates the use of PNG_USER_CONFIG and pngusr.h
2 2
3The makefile builds a minimal write-only decoder with embedded libpng 3The makefile builds a minimal write-only decoder with embedded libpng
4and zlib. 4and zlib.
5 5
6Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC 6Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
7on the make command line. 7on the make command line.
8 8
9If you prefer to use the shared libraries, go to contrib/pngminus 9If you prefer to use the shared libraries, go to contrib/pngminus
10and build the pnm2png application there. 10and build the pnm2png application there.
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile
index 7374a6c..d6f39e2 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile
@@ -1,149 +1,149 @@
1# Makefile for PngMinus (pnm2pngm) 1# Makefile for PngMinus (pnm2pngm)
2# Linux / Unix 2# Linux / Unix
3 3
4#CC=cc 4#CC=cc
5CC=gcc 5CC=gcc
6LD=$(CC) 6LD=$(CC)
7 7
8# If awk fails try 8# If awk fails try
9# make AWK=nawk 9# make AWK=nawk
10 10
11# If cpp fails try 11# If cpp fails try
12# make CPP=/lib/cpp 12# make CPP=/lib/cpp
13 13
14RM=rm -f 14RM=rm -f
15COPY=cp 15COPY=cp
16 16
17CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1 17CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1
18 18
19C=.c 19C=.c
20O=.o 20O=.o
21L=.a 21L=.a
22E= 22E=
23 23
24# Where to find the source code: 24# Where to find the source code:
25PNGSRC =../../.. 25PNGSRC =../../..
26ZLIBSRC=$(PNGSRC)/../zlib 26ZLIBSRC=$(PNGSRC)/../zlib
27PROGSRC=$(PNGSRC)/contrib/pngminus 27PROGSRC=$(PNGSRC)/contrib/pngminus
28 28
29# Zlib 29# Zlib
30ZSRCS = adler32$(C) compress$(C) crc32$(C) deflate$(C) \ 30ZSRCS = adler32$(C) compress$(C) crc32$(C) deflate$(C) \
31 trees$(C) zutil$(C) 31 trees$(C) zutil$(C)
32 32
33# Standard headers 33# Standard headers
34#ZH = zlib.h crc32.h deflate.h trees.h zutil.h 34#ZH = zlib.h crc32.h deflate.h trees.h zutil.h
35ZH = zlib.h crc32.h deflate.h trees.h zutil.h 35ZH = zlib.h crc32.h deflate.h trees.h zutil.h
36 36
37# Machine generated headers 37# Machine generated headers
38ZCONF = zconf.h 38ZCONF = zconf.h
39 39
40# Headers callers use 40# Headers callers use
41ZINC = zlib.h $(ZCONF) 41ZINC = zlib.h $(ZCONF)
42 42
43# Headers the Zlib source uses 43# Headers the Zlib source uses
44ZHDRS = $(ZH) $(ZCONF) 44ZHDRS = $(ZH) $(ZCONF)
45 45
46# compress is not required; it is needed to link the zlib 46# compress is not required; it is needed to link the zlib
47# code because deflate defines an unused API function deflateBound 47# code because deflate defines an unused API function deflateBound
48# which itself calls compressBound from compress. 48# which itself calls compressBound from compress.
49ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) \ 49ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) \
50 trees$(O) zutil$(O) 50 trees$(O) zutil$(O)
51 51
52# libpng 52# libpng
53PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \ 53PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
54 pngset$(C) pngtrans$(C) pngwio$(C) pngwrite$(C) \ 54 pngset$(C) pngtrans$(C) pngwio$(C) pngwrite$(C) \
55 pngwtran$(C) pngwutil$(C) 55 pngwtran$(C) pngwutil$(C)
56 56
57# Standard headers 57# Standard headers
58PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h 58PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
59 59
60# Machine generated headers 60# Machine generated headers
61PNGCONF=pnglibconf.h 61PNGCONF=pnglibconf.h
62 62
63# Headers callers use 63# Headers callers use
64PNGINC= png.h pngconf.h pngusr.h $(PNGCONF) 64PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
65 65
66# Headers the PNG library uses 66# Headers the PNG library uses
67PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h 67PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
68 68
69PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ 69PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
70 pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \ 70 pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \
71 pngwtran$(O) pngwutil$(O) 71 pngwtran$(O) pngwutil$(O)
72 72
73PROGSRCS= pnm2pngm$(C) 73PROGSRCS= pnm2pngm$(C)
74PROGHDRS= 74PROGHDRS=
75PROGDOCS= 75PROGDOCS=
76PROGOBJS= pnm2pngm$(O) 76PROGOBJS= pnm2pngm$(O)
77 77
78OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) 78OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
79 79
80# implicit make rules ------------------------------------------------------- 80# implicit make rules -------------------------------------------------------
81 81
82.c$(O): 82.c$(O):
83 $(CC) -c $(CFLAGS) $< 83 $(CC) -c $(CFLAGS) $<
84 84
85# dependencies 85# dependencies
86 86
87all: pnm2pngm$(E) 87all: pnm2pngm$(E)
88 88
89pnm2pngm$(E): $(OBJS) 89pnm2pngm$(E): $(OBJS)
90 $(LD) -o pnm2pngm$(E) $(OBJS) 90 $(LD) -o pnm2pngm$(E) $(OBJS)
91 91
92# The DFA_XTRA setting turns all libpng options off then 92# The DFA_XTRA setting turns all libpng options off then
93# turns on those required for this minimal build. 93# turns on those required for this minimal build.
94# The CPP_FLAGS setting causes pngusr.h to be included in 94# The CPP_FLAGS setting causes pngusr.h to be included in
95# both the build of pnglibconf.h and, subsequently, when 95# both the build of pnglibconf.h and, subsequently, when
96# building libpng itself. 96# building libpng itself.
97$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\ 97$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\
98 $(PNGSRC)/scripts/pnglibconf.dfa \ 98 $(PNGSRC)/scripts/pnglibconf.dfa \
99 $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa 99 $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
100 $(RM) pnglibconf.h pnglibconf.dfn 100 $(RM) pnglibconf.h pnglibconf.dfn
101 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ 101 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
102 srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\ 102 srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\
103 DFA_XTRA="pngusr.dfa" $@ 103 DFA_XTRA="pngusr.dfa" $@
104 104
105clean: 105clean:
106 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ 106 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
107 srcdir=$(PNGSRC) clean 107 srcdir=$(PNGSRC) clean
108 $(RM) pnm2pngm$(O) 108 $(RM) pnm2pngm$(O)
109 $(RM) pnm2pngm$(E) 109 $(RM) pnm2pngm$(E)
110 $(RM) $(OBJS) 110 $(RM) $(OBJS)
111 111
112# distclean also removes the copied source and headers 112# distclean also removes the copied source and headers
113distclean: clean 113distclean: clean
114 $(RM) -r scripts # historical reasons 114 $(RM) -r scripts # historical reasons
115 $(RM) $(PNGSRCS) $(PNGH) 115 $(RM) $(PNGSRCS) $(PNGH)
116 $(RM) $(ZSRCS) $(ZH) $(ZCONF) 116 $(RM) $(ZSRCS) $(ZH) $(ZCONF)
117 $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS) 117 $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
118 118
119# Header file dependencies: 119# Header file dependencies:
120$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC) 120$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
121$(PNGOBJS): $(PNGHDRS) $(ZINC) 121$(PNGOBJS): $(PNGHDRS) $(ZINC)
122$(ZOBJS): $(ZHDRS) 122$(ZOBJS): $(ZHDRS)
123 123
124# Gather the source code from the respective directories 124# Gather the source code from the respective directories
125$(PNGSRCS) $(PNGH): $(PNGSRC)/$@ 125$(PNGSRCS) $(PNGH): $(PNGSRC)/$@
126 $(RM) $@ 126 $(RM) $@
127 $(COPY) $(PNGSRC)/$@ $@ 127 $(COPY) $(PNGSRC)/$@ $@
128 128
129# No dependency on the ZLIBSRC target so that it only needs 129# No dependency on the ZLIBSRC target so that it only needs
130# to be specified once. 130# to be specified once.
131$(ZSRCS) $(ZH): 131$(ZSRCS) $(ZH):
132 $(RM) $@ 132 $(RM) $@
133 $(COPY) $(ZLIBSRC)/$@ $@ 133 $(COPY) $(ZLIBSRC)/$@ $@
134 134
135# The unconfigured zconf.h varies in name according to the 135# The unconfigured zconf.h varies in name according to the
136# zlib release 136# zlib release
137$(ZCONF): 137$(ZCONF):
138 $(RM) $@ 138 $(RM) $@
139 @for f in zconf.h.in zconf.in.h zconf.h; do\ 139 @for f in zconf.h.in zconf.in.h zconf.h; do\
140 test -r $(ZLIBSRC)/$$f &&\ 140 test -r $(ZLIBSRC)/$$f &&\
141 echo $(COPY) $(ZLIBSRC)/$$f $@ &&\ 141 echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
142 $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\ 142 $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
143 done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1 143 done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
144 144
145pnm2pngm.c: $(PROGSRC)/pnm2png.c 145pnm2pngm.c: $(PROGSRC)/pnm2png.c
146 $(RM) $@ 146 $(RM) $@
147 $(COPY) $(PROGSRC)/pnm2png.c $@ 147 $(COPY) $(PROGSRC)/pnm2png.c $@
148 148
149# End of makefile for pnm2pngm 149# End of makefile for pnm2pngm
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa
index 448f821..ee88443 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa
@@ -1,35 +1,35 @@
1# pngminim/encoder/pngusr.dfa 1# pngminim/encoder/pngusr.dfa
2# 2#
3# Copyright (c) 2010-2011 Glenn Randers-Pehrson 3# Copyright (c) 2010-2011 Glenn Randers-Pehrson
4# 4#
5# This code is released under the libpng license. 5# This code is released under the libpng license.
6# For conditions of distribution and use, see the disclaimer 6# For conditions of distribution and use, see the disclaimer
7# and license in png.h 7# and license in png.h
8 8
9# First all the build options off: 9# First all the build options off:
10 10
11everything = off 11everything = off
12 12
13# Switch on the write code - this makes a minimalist encoder 13# Switch on the write code - this makes a minimalist encoder
14 14
15option WRITE on 15option WRITE on
16 16
17# You must choose fixed or floating point arithmetic: 17# You must choose fixed or floating point arithmetic:
18# option FLOATING_POINT on 18# option FLOATING_POINT on
19 19
20option FIXED_POINT on 20option FIXED_POINT on
21 21
22# You must chose the internal fixed point implementation or to 22# You must chose the internal fixed point implementation or to
23# use the system floating point. The latter is considerably 23# use the system floating point. The latter is considerably
24# smaller (by about 1kbyte on an x86 system): 24# smaller (by about 1kbyte on an x86 system):
25# option FLOATING_ARITHMETIC on 25# option FLOATING_ARITHMETIC on
26 26
27option FLOATING_ARITHMETIC off 27option FLOATING_ARITHMETIC off
28 28
29# Your program will probably need other options. The example 29# Your program will probably need other options. The example
30# program here, pnm2pngm, requires the following. Take a look 30# program here, pnm2pngm, requires the following. Take a look
31# at pnglibconf.h to find out the full set of what has to be 31# at pnglibconf.h to find out the full set of what has to be
32# enabled to make the following work. 32# enabled to make the following work.
33 33
34option SETJMP on 34option SETJMP on
35option STDIO on 35option STDIO on
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h
index bafbf13..2033aad 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h
@@ -1,24 +1,24 @@
1/* minwrpngconf.h: headers to make a minimal png-write-only library 1/* minwrpngconf.h: headers to make a minimal png-write-only library
2 * 2 *
3 * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson 3 * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson
4 * 4 *
5 * This code is released under the libpng license. 5 * This code is released under the libpng license.
6 * For conditions of distribution and use, see the disclaimer 6 * For conditions of distribution and use, see the disclaimer
7 * and license in png.h 7 * and license in png.h
8 * 8 *
9 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson 9 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
10 */ 10 */
11 11
12#ifndef MINWRPNGCONF_H 12#ifndef MINWRPNGCONF_H
13#define MINWRPNGCONF_H 13#define MINWRPNGCONF_H
14 14
15/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */ 15/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
16 16
17/* List options to turn off features of the build that do not 17/* List options to turn off features of the build that do not
18 * affect the API (so are not recorded in pnglibconf.h) 18 * affect the API (so are not recorded in pnglibconf.h)
19 */ 19 */
20 20
21#define PNG_NO_WARNINGS 21#define PNG_NO_WARNINGS
22#define PNG_ALIGN_TYPE PNG_ALIGN_NONE 22#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
23 23
24#endif /* MINWRPNGCONF_H */ 24#endif /* MINWRPNGCONF_H */
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/README b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/README
index e40024e..faa8356 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/README
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/README
@@ -1,15 +1,15 @@
1This demonstrates the use of PNG_USER_CONFIG and pngusr.h 1This demonstrates the use of PNG_USER_CONFIG and pngusr.h
2 2
3The makefile builds a minimal read-only progressive decoder with 3The makefile builds a minimal read-only progressive decoder with
4embedded libpng, zlib and your system's X library. 4embedded libpng, zlib and your system's X library.
5 5
6Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC 6Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
7on the make command line. 7on the make command line.
8 8
9Edit makefile if required, to find your X library and include files, 9Edit makefile if required, to find your X library and include files,
10then 10then
11 11
12 make ZLIBSRC=directory 12 make ZLIBSRC=directory
13 13
14If you prefer to use the shared libraries, go to contrib/gregbook 14If you prefer to use the shared libraries, go to contrib/gregbook
15and build the rpng2-x application there. 15and build the rpng2-x application there.
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/makefile b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/makefile
index a367661..f4b0ccd 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/makefile
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/makefile
@@ -1,165 +1,165 @@
1# Makefile for PngMinus (rpng2) 1# Makefile for PngMinus (rpng2)
2# Linux / Unix 2# Linux / Unix
3 3
4#CC=cc 4#CC=cc
5CC=gcc 5CC=gcc
6LD=$(CC) 6LD=$(CC)
7 7
8# If awk fails try 8# If awk fails try
9# make AWK=nawk 9# make AWK=nawk
10 10
11# If cpp fails try 11# If cpp fails try
12# make CPP=/lib/cpp 12# make CPP=/lib/cpp
13 13
14RM=rm -f 14RM=rm -f
15COPY=cp 15COPY=cp
16 16
17#XINC = -I/usr/include # old-style, stock X distributions 17#XINC = -I/usr/include # old-style, stock X distributions
18#XLIB = -L/usr/lib/X11 -lX11 # (including SGI IRIX) 18#XLIB = -L/usr/lib/X11 -lX11 # (including SGI IRIX)
19 19
20#XINC = -I/usr/openwin/include # Sun workstations (OpenWindows) 20#XINC = -I/usr/openwin/include # Sun workstations (OpenWindows)
21#XLIB = -L/usr/openwin/lib -lX11 21#XLIB = -L/usr/openwin/lib -lX11
22 22
23XINC = -I/usr/X11R6/include # new X distributions (X.org, etc.) 23XINC = -I/usr/X11R6/include # new X distributions (X.org, etc.)
24XLIB = -L/usr/X11R6/lib -lX11 24XLIB = -L/usr/X11R6/lib -lX11
25#XLIB = -L/usr/X11R6/lib64 -lX11 # e.g., Red Hat on AMD64 25#XLIB = -L/usr/X11R6/lib64 -lX11 # e.g., Red Hat on AMD64
26 26
27#XINC = -I/usr/local/include # FreeBSD 27#XINC = -I/usr/local/include # FreeBSD
28#XLIB = -L/usr/local/lib -lX11 28#XLIB = -L/usr/local/lib -lX11
29 29
30#LIBS = $(XLIB) 30#LIBS = $(XLIB)
31LIBS = $(XLIB) -lm #platforms that need libm 31LIBS = $(XLIB) -lm #platforms that need libm
32 32
33CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. $(XINC) -O1 33CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. $(XINC) -O1
34 34
35C=.c 35C=.c
36O=.o 36O=.o
37L=.a 37L=.a
38E= 38E=
39 39
40# Where to find the source code: 40# Where to find the source code:
41PNGSRC =../../.. 41PNGSRC =../../..
42ZLIBSRC=$(PNGSRC)/../zlib 42ZLIBSRC=$(PNGSRC)/../zlib
43PROGSRC=$(PNGSRC)/contrib/gregbook 43PROGSRC=$(PNGSRC)/contrib/gregbook
44 44
45# Zlib (minimal inflate requirements - crc32 is used by libpng) 45# Zlib (minimal inflate requirements - crc32 is used by libpng)
46# zutil can be eliminated if you provide your own zcalloc and zcfree 46# zutil can be eliminated if you provide your own zcalloc and zcfree
47ZSRCS = adler32$(C) crc32$(C) \ 47ZSRCS = adler32$(C) crc32$(C) \
48 inffast$(C) inflate$(C) inftrees$(C) \ 48 inffast$(C) inflate$(C) inftrees$(C) \
49 zutil$(C) 49 zutil$(C)
50 50
51# Standard headers 51# Standard headers
52ZH = zlib.h crc32.h inffast.h inffixed.h \ 52ZH = zlib.h crc32.h inffast.h inffixed.h \
53 inflate.h inftrees.h zutil.h 53 inflate.h inftrees.h zutil.h
54 54
55# Machine generated headers 55# Machine generated headers
56ZCONF = zconf.h 56ZCONF = zconf.h
57 57
58# Headers callers use 58# Headers callers use
59ZINC = zlib.h $(ZCONF) 59ZINC = zlib.h $(ZCONF)
60 60
61# Headers the Zlib source uses 61# Headers the Zlib source uses
62ZHDRS = $(ZH) $(ZCONF) 62ZHDRS = $(ZH) $(ZCONF)
63 63
64ZOBJS = adler32$(O) crc32$(O) \ 64ZOBJS = adler32$(O) crc32$(O) \
65 inffast$(O) inflate$(O) inftrees$(O) \ 65 inffast$(O) inflate$(O) inftrees$(O) \
66 zutil$(O) 66 zutil$(O)
67 67
68# libpng 68# libpng
69PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \ 69PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
70 pngpread$(C) pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \ 70 pngpread$(C) pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \
71 pngset$(C) pngtrans$(C) 71 pngset$(C) pngtrans$(C)
72 72
73# Standard headers 73# Standard headers
74PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h 74PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
75 75
76# Machine generated headers 76# Machine generated headers
77PNGCONF=pnglibconf.h 77PNGCONF=pnglibconf.h
78 78
79# Headers callers use 79# Headers callers use
80PNGINC= png.h pngconf.h pngusr.h $(PNGCONF) 80PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
81 81
82# Headers the PNG library uses 82# Headers the PNG library uses
83PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h 83PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
84 84
85PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ 85PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
86 pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \ 86 pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
87 pngset$(O) pngtrans$(O) 87 pngset$(O) pngtrans$(O)
88 88
89PROGSRCS= rpng2-x$(C) readpng2$(C) 89PROGSRCS= rpng2-x$(C) readpng2$(C)
90PROGHDRS= readpng2.h 90PROGHDRS= readpng2.h
91PROGDOCS= COPYING LICENSE 91PROGDOCS= COPYING LICENSE
92PROGOBJS= rpng2-x$(O) readpng2$(O) 92PROGOBJS= rpng2-x$(O) readpng2$(O)
93 93
94OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) 94OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
95 95
96# implicit make rules ------------------------------------------------------- 96# implicit make rules -------------------------------------------------------
97 97
98.c$(O): 98.c$(O):
99 $(CC) -c $(CFLAGS) $< 99 $(CC) -c $(CFLAGS) $<
100 100
101# dependencies 101# dependencies
102 102
103all: $(PROGDOCS) rpng2-x$(E) 103all: $(PROGDOCS) rpng2-x$(E)
104 104
105rpng2-x$(E): $(OBJS) 105rpng2-x$(E): $(OBJS)
106 $(LD) -o rpng2-x$(E) $(OBJS) $(LIBS) 106 $(LD) -o rpng2-x$(E) $(OBJS) $(LIBS)
107 107
108# The DFA_XTRA setting turns all libpng options off then 108# The DFA_XTRA setting turns all libpng options off then
109# turns on those required for this minimal build. 109# turns on those required for this minimal build.
110# The CPP_FLAGS setting causes pngusr.h to be included in 110# The CPP_FLAGS setting causes pngusr.h to be included in
111# both the build of pnglibconf.h and, subsequently, when 111# both the build of pnglibconf.h and, subsequently, when
112# building libpng itself. 112# building libpng itself.
113$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\ 113$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\
114 $(PNGSRC)/scripts/pnglibconf.dfa \ 114 $(PNGSRC)/scripts/pnglibconf.dfa \
115 $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa 115 $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
116 $(RM) pnglibconf.h pnglibconf.dfn 116 $(RM) pnglibconf.h pnglibconf.dfn
117 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ 117 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
118 srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\ 118 srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\
119 DFA_XTRA="pngusr.dfa" $@ 119 DFA_XTRA="pngusr.dfa" $@
120 120
121clean: 121clean:
122 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ 122 $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
123 srcdir=$(PNGSRC) clean 123 srcdir=$(PNGSRC) clean
124 $(RM) rpng2-x$(O) 124 $(RM) rpng2-x$(O)
125 $(RM) rpng2-x$(E) 125 $(RM) rpng2-x$(E)
126 $(RM) $(OBJS) 126 $(RM) $(OBJS)
127 127
128# distclean also removes the copied source and headers 128# distclean also removes the copied source and headers
129distclean: clean 129distclean: clean
130 $(RM) -r scripts # historical reasons 130 $(RM) -r scripts # historical reasons
131 $(RM) $(PNGSRCS) $(PNGH) 131 $(RM) $(PNGSRCS) $(PNGH)
132 $(RM) $(ZSRCS) $(ZH) $(ZCONF) 132 $(RM) $(ZSRCS) $(ZH) $(ZCONF)
133 $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS) 133 $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
134 134
135# Header file dependencies: 135# Header file dependencies:
136$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC) 136$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
137$(PNGOBJS): $(PNGHDRS) $(ZINC) 137$(PNGOBJS): $(PNGHDRS) $(ZINC)
138$(ZOBJS): $(ZHDRS) 138$(ZOBJS): $(ZHDRS)
139 139
140# Gather the source code from the respective directories 140# Gather the source code from the respective directories
141$(PNGSRCS) $(PNGH): $(PNGSRC)/$@ 141$(PNGSRCS) $(PNGH): $(PNGSRC)/$@
142 $(RM) $@ 142 $(RM) $@
143 $(COPY) $(PNGSRC)/$@ $@ 143 $(COPY) $(PNGSRC)/$@ $@
144 144
145# No dependency on the ZLIBSRC target so that it only needs 145# No dependency on the ZLIBSRC target so that it only needs
146# to be specified once. 146# to be specified once.
147$(ZSRCS) $(ZH): 147$(ZSRCS) $(ZH):
148 $(RM) $@ 148 $(RM) $@
149 $(COPY) $(ZLIBSRC)/$@ $@ 149 $(COPY) $(ZLIBSRC)/$@ $@
150 150
151# The unconfigured zconf.h varies in name according to the 151# The unconfigured zconf.h varies in name according to the
152# zlib release 152# zlib release
153$(ZCONF): 153$(ZCONF):
154 $(RM) $@ 154 $(RM) $@
155 @for f in zconf.h.in zconf.in.h zconf.h; do\ 155 @for f in zconf.h.in zconf.in.h zconf.h; do\
156 test -r $(ZLIBSRC)/$$f &&\ 156 test -r $(ZLIBSRC)/$$f &&\
157 echo $(COPY) $(ZLIBSRC)/$$f $@ &&\ 157 echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
158 $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\ 158 $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
159 done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1 159 done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
160 160
161$(PROGSRCS) $(PROGHDRS) $(PROGDOCS): $(PROGSRC)/$@ 161$(PROGSRCS) $(PROGHDRS) $(PROGDOCS): $(PROGSRC)/$@
162 $(RM) $@ 162 $(RM) $@
163 $(COPY) $(PROGSRC)/$@ $@ 163 $(COPY) $(PROGSRC)/$@ $@
164 164
165# End of makefile for rpng2-x 165# End of makefile for rpng2-x
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.dfa b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.dfa
index 0c991d3..216c421 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.dfa
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.dfa
@@ -1,40 +1,40 @@
1# pngminim/preader/pngusr.dfa 1# pngminim/preader/pngusr.dfa
2# 2#
3# Copyright (c) 2010-2011 Glenn Randers-Pehrson 3# Copyright (c) 2010-2011 Glenn Randers-Pehrson
4# 4#
5# This code is released under the libpng license. 5# This code is released under the libpng license.
6# For conditions of distribution and use, see the disclaimer 6# For conditions of distribution and use, see the disclaimer
7# and license in png.h 7# and license in png.h
8 8
9# First all the build options off: 9# First all the build options off:
10 10
11everything = off 11everything = off
12 12
13# Just switch on the progressive read code 13# Just switch on the progressive read code
14 14
15option PROGRESSIVE_READ on 15option PROGRESSIVE_READ on
16 16
17# You may choose fixed or floating point APIs: 17# You may choose fixed or floating point APIs:
18# option FLOATING_POINT on 18# option FLOATING_POINT on
19 19
20option FIXED_POINT on 20option FIXED_POINT on
21 21
22# You must chose the internal fixed point implementation or to 22# You must chose the internal fixed point implementation or to
23# use the system floating point. The latter is considerably 23# use the system floating point. The latter is considerably
24# smaller (by about 1kbyte on an x86 system): 24# smaller (by about 1kbyte on an x86 system):
25 25
26option FLOATING_ARITHMETIC on 26option FLOATING_ARITHMETIC on
27# option FLOATING_ARITHMETIC off 27# option FLOATING_ARITHMETIC off
28 28
29# Your program will probably need other options. The example 29# Your program will probably need other options. The example
30# program here, rpng2-x, requires the following. Take a look 30# program here, rpng2-x, requires the following. Take a look
31# at pnglibconf.h to find out the full set of what has to be 31# at pnglibconf.h to find out the full set of what has to be
32# enabled to make the following work. 32# enabled to make the following work.
33 33
34option SETJMP on 34option SETJMP on
35option STDIO on 35option STDIO on
36option READ_bKGD on 36option READ_bKGD on
37option READ_GAMMA on 37option READ_GAMMA on
38option READ_EXPAND on 38option READ_EXPAND on
39option READ_STRIP_16_TO_8 on 39option READ_STRIP_16_TO_8 on
40option READ_GRAY_TO_RGB on 40option READ_GRAY_TO_RGB on
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.h b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.h
index 7db806f..73cfecf 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.h
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/preader/pngusr.h
@@ -1,24 +1,24 @@
1/* minrdpngconf.h: headers to make a minimal png-read-only library 1/* minrdpngconf.h: headers to make a minimal png-read-only library
2 * 2 *
3 * Copyright (c) 2009, 2010-2011 Glenn Randers-Pehrson 3 * Copyright (c) 2009, 2010-2011 Glenn Randers-Pehrson
4 * 4 *
5 * This code is released under the libpng license. 5 * This code is released under the libpng license.
6 * For conditions of distribution and use, see the disclaimer 6 * For conditions of distribution and use, see the disclaimer
7 * and license in png.h 7 * and license in png.h
8 * 8 *
9 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson 9 * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
10 */ 10 */
11 11
12#ifndef MINPRDPNGCONF_H 12#ifndef MINPRDPNGCONF_H
13#define MINPRDPNGCONF_H 13#define MINPRDPNGCONF_H
14 14
15/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */ 15/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
16 16
17/* List options to turn off features of the build that do not 17/* List options to turn off features of the build that do not
18 * affect the API (so are not recorded in pnglibconf.h) 18 * affect the API (so are not recorded in pnglibconf.h)
19 */ 19 */
20 20
21#define PNG_NO_WARNINGS 21#define PNG_NO_WARNINGS
22#define PNG_ALIGN_TYPE PNG_ALIGN_NONE 22#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
23 23
24#endif /* MINPRDPNGCONF_H */ 24#endif /* MINPRDPNGCONF_H */
generated by cgit v1.1 at 2024-10-21 19:58:31 +0000