4 files changed, 223 insertions, 223 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 @@
-This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa
+This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa
-The makefile builds a minimal read-only decoder with embedded libpng
+The makefile builds a minimal read-only decoder with embedded libpng
-and zlib.
+and zlib.
-Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
+Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
-on the make command line.
+on the make command line.
-If you prefer to use the shared libraries, go to contrib/pngminus
+If you prefer to use the shared libraries, go to contrib/pngminus
-and build the png2pnm application there.
+and 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 @@
-# Makefile for PngMinus (pngm2pnm)
+# Makefile for PngMinus (pngm2pnm)
-# Linux / Unix
+# Linux / Unix
-#CC=cc
+#CC=cc
-CC=gcc
+CC=gcc
-LD=$(CC)
+LD=$(CC)
-# If awk fails try
+# If awk fails try
-# make AWK=nawk
+# make AWK=nawk
-# If cpp fails try
+# If cpp fails try
-# make CPP=/lib/cpp
+# make CPP=/lib/cpp
-RM=rm -f
+RM=rm -f
-COPY=cp
+COPY=cp
-CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. -O1
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. -O1
-C=.c
+C=.c
-O=.o
+O=.o
-L=.a
+L=.a
-E=
+E=
-# Where to find the source code:
+# Where to find the source code:
-PNGSRC =../../..
+PNGSRC =../../..
-ZLIBSRC=$(PNGSRC)/../zlib
+ZLIBSRC=$(PNGSRC)/../zlib
-PROGSRC=$(PNGSRC)/contrib/pngminus
+PROGSRC=$(PNGSRC)/contrib/pngminus
-# Zlib (minimal inflate requirements - crc32 is used by libpng)
+# Zlib (minimal inflate requirements - crc32 is used by libpng)
-# zutil can be eliminated if you provide your own zcalloc and zcfree
+# zutil can be eliminated if you provide your own zcalloc and zcfree
-ZSRCS  = adler32$(C) crc32$(C) \
+ZSRCS  = adler32$(C) crc32$(C) \
-         inffast$(C) inflate$(C) inftrees$(C) \
+         inffast$(C) inflate$(C) inftrees$(C) \
-         zutil$(C)
+         zutil$(C)
-# Standard headers
+# Standard headers
-ZH     = zlib.h crc32.h inffast.h inffixed.h \
+ZH     = zlib.h crc32.h inffast.h inffixed.h \
-         inflate.h inftrees.h zutil.h
+         inflate.h inftrees.h zutil.h
-# Machine generated headers
+# Machine generated headers
-ZCONF  = zconf.h
+ZCONF  = zconf.h
-# Headers callers use
+# Headers callers use
-ZINC   = zlib.h $(ZCONF)
+ZINC   = zlib.h $(ZCONF)
-# Headers the Zlib source uses
+# Headers the Zlib source uses
-ZHDRS  = $(ZH) $(ZCONF)
+ZHDRS  = $(ZH) $(ZCONF)
-ZOBJS  = adler32$(O) crc32$(O) \
+ZOBJS  = adler32$(O) crc32$(O) \
-         inffast$(O) inflate$(O) inftrees$(O) \
+         inffast$(O) inflate$(O) inftrees$(O) \
-         zutil$(O)
+         zutil$(O)
-# libpng
+# libpng
-PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
+PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
-        pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \
+        pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \
-        pngset$(C) pngtrans$(C)
+        pngset$(C) pngtrans$(C)
-        
+        
-# Standard headers
+# Standard headers
-PNGH   =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
+PNGH   =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
-# Machine generated headers
+# Machine generated headers
-PNGCONF=pnglibconf.h
+PNGCONF=pnglibconf.h
-# Headers callers use
+# Headers callers use
-PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
+PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
-# Headers the PNG library uses
+# Headers the PNG library uses
-PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
+PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
-PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
+PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
-        pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
+        pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
-        pngset$(O) pngtrans$(O)
+        pngset$(O) pngtrans$(O)
-PROGSRCS= pngm2pnm$(C)
+PROGSRCS= pngm2pnm$(C)
-PROGHDRS=
+PROGHDRS=
-PROGDOCS=
+PROGDOCS=
-PROGOBJS= pngm2pnm$(O)
+PROGOBJS= pngm2pnm$(O)
-OBJS    = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
+OBJS    = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
-# implicit make rules -------------------------------------------------------
+# implicit make rules -------------------------------------------------------
-# note: dependencies do not work on implicit rule lines
+# note: dependencies do not work on implicit rule lines
-.c$(O):
+.c$(O):
-        $(CC) -c $(CFLAGS) $<
+        $(CC) -c $(CFLAGS) $<
-# dependencies
+# dependencies
-all: pngm2pnm$(E)
+all: pngm2pnm$(E)
-pngm2pnm$(E): $(OBJS)
+pngm2pnm$(E): $(OBJS)
-        $(LD) -o pngm2pnm$(E) $(OBJS)
+        $(LD) -o pngm2pnm$(E) $(OBJS)
-# The DFA_XTRA setting turns all libpng options off then
+# The DFA_XTRA setting turns all libpng options off then
-# turns on those required for this minimal build.
+# turns on those required for this minimal build.
-# The CPP_FLAGS setting causes pngusr.h to be included in
+# The CPP_FLAGS setting causes pngusr.h to be included in
-# both the build of pnglibconf.h and, subsequently, when
+# both the build of pnglibconf.h and, subsequently, when
-# building libpng itself.
+# building libpng itself.
-$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\
+$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\
-        $(PNGSRC)/scripts/pnglibconf.dfa \
+        $(PNGSRC)/scripts/pnglibconf.dfa \
-        $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
+        $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
-        $(RM) pnglibconf.h pnglibconf.dfn
+        $(RM) pnglibconf.h pnglibconf.dfn
-        $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
+        $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
-            srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\
+            srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\
-            DFA_XTRA="pngusr.dfa" $@
+            DFA_XTRA="pngusr.dfa" $@
-clean:
+clean:
-        $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
+        $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
-            srcdir=$(PNGSRC) clean
+            srcdir=$(PNGSRC) clean
-        $(RM) pngm2pnm$(O)
+        $(RM) pngm2pnm$(O)
-        $(RM) pngm2pnm$(E)
+        $(RM) pngm2pnm$(E)
-        $(RM) $(OBJS)
+        $(RM) $(OBJS)
-# distclean also removes the copied source and headers
+# distclean also removes the copied source and headers
-distclean: clean
+distclean: clean
-        $(RM) -r scripts # historical reasons
+        $(RM) -r scripts # historical reasons
-        $(RM) $(PNGSRCS) $(PNGH)
+        $(RM) $(PNGSRCS) $(PNGH)
-        $(RM) $(ZSRCS) $(ZH) $(ZCONF)
+        $(RM) $(ZSRCS) $(ZH) $(ZCONF)
-        $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
+        $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
-# Header file dependencies:
+# Header file dependencies:
-$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
+$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
-$(PNGOBJS): $(PNGHDRS) $(ZINC)
+$(PNGOBJS): $(PNGHDRS) $(ZINC)
-$(ZOBJS): $(ZHDRS)
+$(ZOBJS): $(ZHDRS)
-# Gather the source code from the respective directories
+# Gather the source code from the respective directories
-$(PNGSRCS) $(PNGH): $(PNGSRC)/$@
+$(PNGSRCS) $(PNGH): $(PNGSRC)/$@
-        $(RM) $@
+        $(RM) $@
-        $(COPY) $(PNGSRC)/$@ $@
+        $(COPY) $(PNGSRC)/$@ $@
-# No dependency on the ZLIBSRC target so that it only needs
+# No dependency on the ZLIBSRC target so that it only needs
-# to be specified once.
+# to be specified once.
-$(ZSRCS) $(ZH):
+$(ZSRCS) $(ZH):
-        $(RM) $@
+        $(RM) $@
-        $(COPY) $(ZLIBSRC)/$@ $@
+        $(COPY) $(ZLIBSRC)/$@ $@
-# The unconfigured zconf.h varies in name according to the
+# The unconfigured zconf.h varies in name according to the
-# zlib release
+# zlib release
-$(ZCONF):
+$(ZCONF):
-        $(RM) $@
+        $(RM) $@
-        @for f in zconf.h.in zconf.in.h zconf.h; do\
+        @for f in zconf.h.in zconf.in.h zconf.h; do\
-            test -r $(ZLIBSRC)/$$f &&\
+            test -r $(ZLIBSRC)/$$f &&\
-            echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
+            echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
-            $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
+            $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
-        done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
+        done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
-pngm2pnm.c: $(PROGSRC)/png2pnm.c
+pngm2pnm.c: $(PROGSRC)/png2pnm.c
-        $(RM) $@
+        $(RM) $@
-        $(COPY) $(PROGSRC)/png2pnm.c $@
+        $(COPY) $(PROGSRC)/png2pnm.c $@
-# End of makefile for pngm2pnm
+# 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 @@
-# pngminim/decoder/pngusr.dfa
+# pngminim/decoder/pngusr.dfa
-#
+#
-# Copyright (c) 2010-2011 Glenn Randers-Pehrson
+# Copyright (c) 2010-2011 Glenn Randers-Pehrson
-#
+#
-# This code is released under the libpng license.
+# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
+# For conditions of distribution and use, see the disclaimer
-# and license in png.h
+# and license in png.h
-# First all the build options off:
+# First all the build options off:
-everything = off
+everything = off
-# All that is required is some read code. This example switches
+# All that is required is some read code. This example switches
-# on the sequential read code (see ../preader for a progressive
+# on the sequential read code (see ../preader for a progressive
-# read example).
+# read example).
-option SEQUENTIAL_READ on
+option SEQUENTIAL_READ on
-# You must choose fixed or floating point arithmetic:
+# You must choose fixed or floating point arithmetic:
-# option FLOATING_POINT on
+# option FLOATING_POINT on
-option FIXED_POINT on
+option FIXED_POINT on
-# You must chose the internal fixed point implementation or to
+# You must chose the internal fixed point implementation or to
-# use the system floating point.  The latter is considerably
+# use the system floating point.  The latter is considerably
-# smaller (by about 1kbyte on an x86 system):
+# smaller (by about 1kbyte on an x86 system):
-# option FLOATING_ARITHMETIC on
+# option FLOATING_ARITHMETIC on
-option FLOATING_ARITHMETIC off
+option FLOATING_ARITHMETIC off
-# Your program will probably need other options.  The example
+# Your program will probably need other options.  The example
-# program here, pngm2pnm, requires the following.  Take a look
+# program here, pngm2pnm, requires the following.  Take a look
-# at pnglibconf.h to find out the full set of what has to be
+# at pnglibconf.h to find out the full set of what has to be
-# enabled to make the following work.
+# enabled to make the following work.
-option SETJMP on
+option SETJMP on
-option STDIO on
+option STDIO on
-option READ_EXPAND on
+option READ_EXPAND on
-option READ_STRIP_16_TO_8 on
+option 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 @@
-/* minrdpngconf.h: headers to make a minimal png-read-only library
+/* minrdpngconf.h: headers to make a minimal png-read-only library
- *
+ *
- * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson
+ * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson
- *
+ *
- * This code is released under the libpng license.
+ * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
+ * For conditions of distribution and use, see the disclaimer
- * and license in png.h
+ * and license in png.h
- *
+ *
- * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
+ * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
- */
+ */
-#ifndef MINRDPNGCONF_H
+#ifndef MINRDPNGCONF_H
-#define MINRDPNGCONF_H
+#define MINRDPNGCONF_H
-/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
+/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
-/* List options to turn off features of the build that do not
+/* List options to turn off features of the build that do not
- * affect the API (so are not recorded in pnglibconf.h)
+ * affect the API (so are not recorded in pnglibconf.h)
- */
+ */
-#define PNG_NO_WARNINGS
+#define PNG_NO_WARNINGS
-#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
+#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
-#endif /* MINRDPNGCONF_H */
+#endif /* MINRDPNGCONF_H */

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 @@
1	This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa	1	This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa
2		2
3	The makefile builds a minimal read-only decoder with embedded libpng	3	The makefile builds a minimal read-only decoder with embedded libpng
4	and zlib.	4	and zlib.
5		5
6	Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC	6	Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
7	on the make command line.	7	on the make command line.
8		8
9	If you prefer to use the shared libraries, go to contrib/pngminus	9	If you prefer to use the shared libraries, go to contrib/pngminus
10	and build the png2pnm application there.	10	and 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
5	CC=gcc	5	CC=gcc
6	LD=$(CC)	6	LD=$(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
14	RM=rm -f	14	RM=rm -f
15	COPY=cp	15	COPY=cp
16		16
17	CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. -O1	17	CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. -O1
18		18
19	C=.c	19	C=.c
20	O=.o	20	O=.o
21	L=.a	21	L=.a
22	E=	22	E=
23		23
24	# Where to find the source code:	24	# Where to find the source code:
25	PNGSRC =../../..	25	PNGSRC =../../..
26	ZLIBSRC=$(PNGSRC)/../zlib	26	ZLIBSRC=$(PNGSRC)/../zlib
27	PROGSRC=$(PNGSRC)/contrib/pngminus	27	PROGSRC=$(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
31	ZSRCS = adler32$(C) crc32$(C) \	31	ZSRCS = 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
36	ZH = zlib.h crc32.h inffast.h inffixed.h \	36	ZH = 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
40	ZCONF = zconf.h	40	ZCONF = zconf.h
41		41
42	# Headers callers use	42	# Headers callers use
43	ZINC = zlib.h $(ZCONF)	43	ZINC = zlib.h $(ZCONF)
44		44
45	# Headers the Zlib source uses	45	# Headers the Zlib source uses
46	ZHDRS = $(ZH) $(ZCONF)	46	ZHDRS = $(ZH) $(ZCONF)
47		47
48	ZOBJS = adler32$(O) crc32$(O) \	48	ZOBJS = 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
53	PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \	53	PNGSRCS=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
58	PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h	58	PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
59		59
60	# Machine generated headers	60	# Machine generated headers
61	PNGCONF=pnglibconf.h	61	PNGCONF=pnglibconf.h
62		62
63	# Headers callers use	63	# Headers callers use
64	PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)	64	PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
65		65
66	# Headers the PNG library uses	66	# Headers the PNG library uses
67	PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h	67	PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
68		68
69	PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \	69	PNGOBJS=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
73	PROGSRCS= pngm2pnm$(C)	73	PROGSRCS= pngm2pnm$(C)
74	PROGHDRS=	74	PROGHDRS=
75	PROGDOCS=	75	PROGDOCS=
76	PROGOBJS= pngm2pnm$(O)	76	PROGOBJS= pngm2pnm$(O)
77		77
78	OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)	78	OBJS = $(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
88	all: pngm2pnm$(E)	88	all: pngm2pnm$(E)
89		89
90	pngm2pnm$(E): $(OBJS)	90	pngm2pnm$(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
106	clean:	106	clean:
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
114	distclean: clean	114	distclean: 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
146	pngm2pnm.c: $(PROGSRC)/png2pnm.c	146	pngm2pnm.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
11	everything = off	11	everything = 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
17	option SEQUENTIAL_READ on	17	option 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
22	option FIXED_POINT on	22	option 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
29	option FLOATING_ARITHMETIC off	29	option 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
36	option SETJMP on	36	option SETJMP on
37	option STDIO on	37	option STDIO on
38	option READ_EXPAND on	38	option READ_EXPAND on
39	option READ_STRIP_16_TO_8 on	39	option 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 */