aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts
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/scripts
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 '')
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/README.txt152
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/SCOPTIONS.ppc14
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/checksym.awk322
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/chkfmt274
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/def.dfn76
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/descrip.mms104
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-body.in192
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-head.in48
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng.pc.in20
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.32sunu482
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.64sunu482
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.acorn114
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.aix242
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.amiga112
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.atari126
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bc32302
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.beos430
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bor322
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.cegcc232
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.darwin440
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dec404
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dj2124
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.elf526
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.freebsd106
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.gcc174
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hp64448
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpgcc460
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpux442
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ibmc164
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.intel220
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.knr218
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.linux478
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.mips188
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.msc190
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ne12bsd100
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.netbsd100
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.openbsd164
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sco436
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sggcc456
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sgi458
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.so9478
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris472
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris-x86472
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.std246
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sunos214
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.tc3186
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.vcwin32216
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makevms.com284
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/options.awk1554
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.dfa1156
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.h.prebuilt374
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.mak116
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pngwin.rc224
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/smakefile.ppc68
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/sym.dfn30
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.def482
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.dfn114
-rw-r--r--libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/vers.dfn52
58 files changed, 8540 insertions, 8540 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/README.txt b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/README.txt
index e0a229f..836d835 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/README.txt
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/README.txt
@@ -1,76 +1,76 @@
1 1
2Makefiles for libpng version 1.5.9 - February 18, 2012 2Makefiles for libpng version 1.5.9 - February 18, 2012
3 3
4pnglibconf.h.prebuilt => Stores configuration settings 4pnglibconf.h.prebuilt => Stores configuration settings
5 makefile.linux => Linux/ELF makefile 5 makefile.linux => Linux/ELF makefile
6 (gcc, creates libpng15.so.15.1.5.9) 6 (gcc, creates libpng15.so.15.1.5.9)
7 makefile.gcc => Generic makefile (gcc, creates static libpng.a) 7 makefile.gcc => Generic makefile (gcc, creates static libpng.a)
8 makefile.knr => Archaic UNIX Makefile that converts files with 8 makefile.knr => Archaic UNIX Makefile that converts files with
9 ansi2knr (Requires ansi2knr.c from 9 ansi2knr (Requires ansi2knr.c from
10 ftp://ftp.cs.wisc.edu/ghost) 10 ftp://ftp.cs.wisc.edu/ghost)
11 makefile.acorn => Acorn makefile 11 makefile.acorn => Acorn makefile
12 makefile.aix => AIX/gcc makefile 12 makefile.aix => AIX/gcc makefile
13 makefile.amiga => Amiga makefile 13 makefile.amiga => Amiga makefile
14 makefile.atari => Atari makefile 14 makefile.atari => Atari makefile
15 makefile.bc32 => 32-bit Borland C++ (all modules compiled in C mode) 15 makefile.bc32 => 32-bit Borland C++ (all modules compiled in C mode)
16 makefile.beos => beos makefile 16 makefile.beos => beos makefile
17 makefile.bor => Borland makefile (uses bcc) 17 makefile.bor => Borland makefile (uses bcc)
18 makefile.cegcc => minge32ce for Windows CE makefile 18 makefile.cegcc => minge32ce for Windows CE makefile
19 makefile.darwin => Darwin makefile, can use on MacosX 19 makefile.darwin => Darwin makefile, can use on MacosX
20 makefile.dec => DEC Alpha UNIX makefile 20 makefile.dec => DEC Alpha UNIX makefile
21 makefile.dj2 => DJGPP 2 makefile 21 makefile.dj2 => DJGPP 2 makefile
22 makefile.elf => Linux/ELF makefile symbol versioning, 22 makefile.elf => Linux/ELF makefile symbol versioning,
23 (gcc, creates libpng15.so.15.1.5.9) 23 (gcc, creates libpng15.so.15.1.5.9)
24 makefile.freebsd => FreeBSD makefile 24 makefile.freebsd => FreeBSD makefile
25 makefile.gcc => Generic gcc makefile 25 makefile.gcc => Generic gcc makefile
26 makefile.hpgcc => HPUX makefile using gcc 26 makefile.hpgcc => HPUX makefile using gcc
27 makefile.hpux => HPUX (10.20 and 11.00) makefile 27 makefile.hpux => HPUX (10.20 and 11.00) makefile
28 makefile.hp64 => HPUX (10.20 and 11.00) makefile, 64-bit 28 makefile.hp64 => HPUX (10.20 and 11.00) makefile, 64-bit
29 makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static) 29 makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static)
30 makefile.intel => Intel C/C++ version 4.0 and later 30 makefile.intel => Intel C/C++ version 4.0 and later
31 makefile.mips => MIPS makefile 31 makefile.mips => MIPS makefile
32 makefile.msc => Microsoft C makefile 32 makefile.msc => Microsoft C makefile
33 makefile.netbsd => NetBSD/cc makefile, makes libpng.so. 33 makefile.netbsd => NetBSD/cc makefile, makes libpng.so.
34 makefile.openbsd => OpenBSD makefile 34 makefile.openbsd => OpenBSD makefile
35 makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def) 35 makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
36 makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc 36 makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
37 makefile.sggcc => Silicon Graphics (gcc, 37 makefile.sggcc => Silicon Graphics (gcc,
38 creates libpng15.so.15.1.5.9) 38 creates libpng15.so.15.1.5.9)
39 makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) 39 makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
40 makefile.solaris => Solaris 2.X makefile (gcc, 40 makefile.solaris => Solaris 2.X makefile (gcc,
41 creates libpng15.so.15.1.5.9) 41 creates libpng15.so.15.1.5.9)
42 makefile.so9 => Solaris 9 makefile (gcc, 42 makefile.so9 => Solaris 9 makefile (gcc,
43 creates libpng15.so.15.1.5.9) 43 creates libpng15.so.15.1.5.9)
44 makefile.std => Generic UNIX makefile (cc, creates static libpng.a) 44 makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
45 makefile.sunos => Sun makefile 45 makefile.sunos => Sun makefile
46 makefile.32sunu => Sun Ultra 32-bit makefile 46 makefile.32sunu => Sun Ultra 32-bit makefile
47 makefile.64sunu => Sun Ultra 64-bit makefile 47 makefile.64sunu => Sun Ultra 64-bit makefile
48 makefile.tc3 => Turbo C 3.0 makefile 48 makefile.tc3 => Turbo C 3.0 makefile
49 makefile.vcwin32 => makefile for Microsoft Visual C++ 4.0 and later 49 makefile.vcwin32 => makefile for Microsoft Visual C++ 4.0 and later
50 makevms.com => VMS build script 50 makevms.com => VMS build script
51 smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler 51 smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler
52 (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) 52 (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc)
53 53
54Other supporting scripts: 54Other supporting scripts:
55 README.txt => This file 55 README.txt => This file
56 descrip.mms => VMS makefile for MMS or MMK 56 descrip.mms => VMS makefile for MMS or MMK
57 libpng-config-body.in => used by several makefiles to create libpng-config 57 libpng-config-body.in => used by several makefiles to create libpng-config
58 libpng-config-head.in => used by several makefiles to create libpng-config 58 libpng-config-head.in => used by several makefiles to create libpng-config
59 libpng.pc.in => Used by several makefiles to create libpng.pc 59 libpng.pc.in => Used by several makefiles to create libpng.pc
60 pngwin.rc => Used by the visualc71 project. 60 pngwin.rc => Used by the visualc71 project.
61 pngwin.def => Used by makefile.os2 61 pngwin.def => Used by makefile.os2
62 pngwin.dfn => Used to maintain pngwin.def 62 pngwin.dfn => Used to maintain pngwin.def
63 SCOPTIONS.ppc => Used with smakefile.ppc 63 SCOPTIONS.ppc => Used with smakefile.ppc
64 64
65checksym.awk => Used for maintaining pnglibconf.h 65checksym.awk => Used for maintaining pnglibconf.h
66def.dfn => Used for maintaining pnglibconf.h 66def.dfn => Used for maintaining pnglibconf.h
67options.awk => Used for maintaining pnglibconf.h 67options.awk => Used for maintaining pnglibconf.h
68pnglibconf.dfa => Used for maintaining pnglibconf.h 68pnglibconf.dfa => Used for maintaining pnglibconf.h
69pnglibconf.mak => Used for maintaining pnglibconf.h 69pnglibconf.mak => Used for maintaining pnglibconf.h
70sym.dfn => Used for symbol versioning 70sym.dfn => Used for symbol versioning
71symbols.def => Used for symbol versioning 71symbols.def => Used for symbol versioning
72symbols.dfn => Used for symbol versioning 72symbols.dfn => Used for symbol versioning
73vers.dfn => Used for symbol versioning 73vers.dfn => Used for symbol versioning
74 74
75 75
76Further information can be found in comments in the individual makefiles. 76Further information can be found in comments in the individual makefiles.
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/SCOPTIONS.ppc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/SCOPTIONS.ppc
index 7090fd4..2c3503e 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/SCOPTIONS.ppc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/SCOPTIONS.ppc
@@ -1,7 +1,7 @@
1OPTIMIZE 1OPTIMIZE
2OPTPEEP 2OPTPEEP
3OPTTIME 3OPTTIME
4OPTSCHED 4OPTSCHED
5AUTOREGISTER 5AUTOREGISTER
6PARMS=REGISTERS 6PARMS=REGISTERS
7INCLUDEDIR=hlp:ppc/include 7INCLUDEDIR=hlp:ppc/include
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/checksym.awk b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/checksym.awk
index 5bafa8c..ba4c99b 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/checksym.awk
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/checksym.awk
@@ -1,161 +1,161 @@
1#!/bin/awk -f 1#!/bin/awk -f
2# Check a list of symbols against the master definition 2# Check a list of symbols against the master definition
3# (official) list. Arguments: 3# (official) list. Arguments:
4# 4#
5# awk -f checksym.awk official-def list-to-check 5# awk -f checksym.awk official-def list-to-check
6# 6#
7# Output is a file in the current directory called 'symbols.new', 7# Output is a file in the current directory called 'symbols.new',
8# stdout holds error messages. Error code indicates success or 8# stdout holds error messages. Error code indicates success or
9# failure. 9# failure.
10# 10#
11# NOTE: this is a pure, old fashioned, awk script. It will 11# NOTE: this is a pure, old fashioned, awk script. It will
12# work with any awk 12# work with any awk
13 13
14BEGIN{ 14BEGIN{
15 err=0 15 err=0
16 master="" # master file 16 master="" # master file
17 official[1] = "" # defined symbols from master file 17 official[1] = "" # defined symbols from master file
18 symbol[1] = "" # defined symbols from png.h 18 symbol[1] = "" # defined symbols from png.h
19 removed[1] = "" # removed symbols from png.h 19 removed[1] = "" # removed symbols from png.h
20 lasto = 0 # last ordinal value from png.h 20 lasto = 0 # last ordinal value from png.h
21 mastero = 0 # highest ordinal in master file 21 mastero = 0 # highest ordinal in master file
22 symbolo = 0 # highest ordinal in png.h 22 symbolo = 0 # highest ordinal in png.h
23 missing = "error"# log an error on missing symbols 23 missing = "error"# log an error on missing symbols
24} 24}
25 25
26# Read existing definitions from the master file (the first 26# Read existing definitions from the master file (the first
27# file on the command line.) This must be a def file and it 27# file on the command line.) This must be a def file and it
28# has definition lines (others are ignored) of the form: 28# has definition lines (others are ignored) of the form:
29# 29#
30# symbol @ordinal 30# symbol @ordinal
31# 31#
32master == "" { 32master == "" {
33 master = FILENAME 33 master = FILENAME
34} 34}
35FILENAME==master && NF==2 && $2~/^@/ && $1!~/^;/ { 35FILENAME==master && NF==2 && $2~/^@/ && $1!~/^;/ {
36 o=0+substr($2,2) 36 o=0+substr($2,2)
37 if (o > 0) { 37 if (o > 0) {
38 if (official[o] == "") { 38 if (official[o] == "") {
39 official[o] = $1 39 official[o] = $1
40 if (o > mastero) mastero = o 40 if (o > mastero) mastero = o
41 next 41 next
42 } else 42 } else
43 print master ": duplicated symbol:", official[o] ":", $0 43 print master ": duplicated symbol:", official[o] ":", $0
44 } else 44 } else
45 print master ": bad export line format:", $0 45 print master ": bad export line format:", $0
46 err = 1 46 err = 1
47} 47}
48FILENAME==master && $1==";missing" && NF==2{ 48FILENAME==master && $1==";missing" && NF==2{
49 # This allows the master file to control how missing symbols 49 # This allows the master file to control how missing symbols
50 # are handled; symbols that aren't in either the master or 50 # are handled; symbols that aren't in either the master or
51 # the new file. Valid values are 'ignore', 'warning' and 51 # the new file. Valid values are 'ignore', 'warning' and
52 # 'error' 52 # 'error'
53 missing = $2 53 missing = $2
54} 54}
55FILENAME==master { 55FILENAME==master {
56 next 56 next
57} 57}
58 58
59# Read new definitions, these are free form but the lines must 59# Read new definitions, these are free form but the lines must
60# just be symbol definitions. Lines will be commented out for 60# just be symbol definitions. Lines will be commented out for
61# 'removed' symbols, introduced in png.h using PNG_REMOVED rather 61# 'removed' symbols, introduced in png.h using PNG_REMOVED rather
62# than PNG_EXPORT. Use symbols.dfn or pngwin.dfn to generate the 62# than PNG_EXPORT. Use symbols.dfn or pngwin.dfn to generate the
63# input file. 63# input file.
64# 64#
65# symbol @ordinal # two fields, exported symbol 65# symbol @ordinal # two fields, exported symbol
66# ; symbol @ordinal # three fields, removed symbol 66# ; symbol @ordinal # three fields, removed symbol
67# ; @ordinal # two fields, the last ordinal 67# ; @ordinal # two fields, the last ordinal
68NF==2 && $1 == ";" && $2 ~ /^@[1-9][0-9]*$/ { # last ordinal 68NF==2 && $1 == ";" && $2 ~ /^@[1-9][0-9]*$/ { # last ordinal
69 o=0+substr($2,2) 69 o=0+substr($2,2)
70 if (lasto == 0 || lasto == o) 70 if (lasto == 0 || lasto == o)
71 lasto=o 71 lasto=o
72 else { 72 else {
73 print "png.h: duplicated last ordinal:", lasto, o 73 print "png.h: duplicated last ordinal:", lasto, o
74 err = 1 74 err = 1
75 } 75 }
76 next 76 next
77} 77}
78NF==3 && $1 == ";" && $3 ~ /^@[1-9][0-9]*$/ { # removed symbol 78NF==3 && $1 == ";" && $3 ~ /^@[1-9][0-9]*$/ { # removed symbol
79 o=0+substr($3,2) 79 o=0+substr($3,2)
80 if (removed[o] == "" || removed[o] == $2) { 80 if (removed[o] == "" || removed[o] == $2) {
81 removed[o] = $2 81 removed[o] = $2
82 if (o > symbolo) symbolo = o 82 if (o > symbolo) symbolo = o
83 } else { 83 } else {
84 print "png.h: duplicated removed symbol", o ": '" removed[o] "' != '" $2 "'" 84 print "png.h: duplicated removed symbol", o ": '" removed[o] "' != '" $2 "'"
85 err = 1 85 err = 1
86 } 86 }
87 next 87 next
88} 88}
89NF==2 && $2 ~ /^@[1-9][0-9]*$/ { # exported symbol 89NF==2 && $2 ~ /^@[1-9][0-9]*$/ { # exported symbol
90 o=0+substr($2,2) 90 o=0+substr($2,2)
91 if (symbol[o] == "" || symbol[o] == $1) { 91 if (symbol[o] == "" || symbol[o] == $1) {
92 symbol[o] = $1 92 symbol[o] = $1
93 if (o > symbolo) symbolo = o 93 if (o > symbolo) symbolo = o
94 } else { 94 } else {
95 print "png.h: duplicated symbol", o ": '" symbol[o] "' != '" $1 "'" 95 print "png.h: duplicated symbol", o ": '" symbol[o] "' != '" $1 "'"
96 err = 1 96 err = 1
97 } 97 }
98} 98}
99{ 99{
100 next # skip all other lines 100 next # skip all other lines
101} 101}
102 102
103# At the end check for symbols marked as both duplicated and removed 103# At the end check for symbols marked as both duplicated and removed
104END{ 104END{
105 if (symbolo > lasto) { 105 if (symbolo > lasto) {
106 print "highest symbol ordinal in png.h,", symbolo ", exceeds last ordinal from png.h", lasto 106 print "highest symbol ordinal in png.h,", symbolo ", exceeds last ordinal from png.h", lasto
107 err = 1 107 err = 1
108 } 108 }
109 if (mastero > lasto) { 109 if (mastero > lasto) {
110 print "highest symbol ordinal in", master ",", mastero ", exceeds last ordinal from png.h", lasto 110 print "highest symbol ordinal in", master ",", mastero ", exceeds last ordinal from png.h", lasto
111 err = 1 111 err = 1
112 } 112 }
113 unexported=0 113 unexported=0
114 for (o=1; o<=lasto; ++o) { 114 for (o=1; o<=lasto; ++o) {
115 if (symbol[o] == "" && removed[o] == "") { 115 if (symbol[o] == "" && removed[o] == "") {
116 if (unexported == 0) unexported = o 116 if (unexported == 0) unexported = o
117 if (official[o] == "") { 117 if (official[o] == "") {
118 # missing in export list too, so ok 118 # missing in export list too, so ok
119 if (o < lasto) continue 119 if (o < lasto) continue
120 } 120 }
121 } 121 }
122 if (unexported != 0) { 122 if (unexported != 0) {
123 # Symbols in the .def but not in the new file are errors, but 123 # Symbols in the .def but not in the new file are errors, but
124 # the 'unexported' symbols aren't in either. By default this 124 # the 'unexported' symbols aren't in either. By default this
125 # is an error too (see the setting of 'missing' at the start), 125 # is an error too (see the setting of 'missing' at the start),
126 # but this can be reset on the command line or by stuff in the 126 # but this can be reset on the command line or by stuff in the
127 # file - see the comments above. 127 # file - see the comments above.
128 if (missing != "ignore") { 128 if (missing != "ignore") {
129 if (o-1 > unexported) 129 if (o-1 > unexported)
130 print "png.h:", missing ": missing symbols:", unexported "-" o-1 130 print "png.h:", missing ": missing symbols:", unexported "-" o-1
131 else 131 else
132 print "png.h:", missing ": missing symbol:", unexported 132 print "png.h:", missing ": missing symbol:", unexported
133 if (missing != "warning") 133 if (missing != "warning")
134 err = 1 134 err = 1
135 } 135 }
136 unexported = 0 136 unexported = 0
137 } 137 }
138 if (symbol[o] != "" && removed[o] != "") { 138 if (symbol[o] != "" && removed[o] != "") {
139 print "png.h: symbol", o, "both exported as '" symbol[o] "' and removed as '" removed[o] "'" 139 print "png.h: symbol", o, "both exported as '" symbol[o] "' and removed as '" removed[o] "'"
140 err = 1 140 err = 1
141 } else if (symbol[o] != official[o]) { 141 } else if (symbol[o] != official[o]) {
142 # either the symbol is missing somewhere or it changed 142 # either the symbol is missing somewhere or it changed
143 err = 1 143 err = 1
144 if (symbol[o] == "") 144 if (symbol[o] == "")
145 print "png.h: symbol", o, "is exported as '" official[o] "' in", master 145 print "png.h: symbol", o, "is exported as '" official[o] "' in", master
146 else if (official[o] == "") 146 else if (official[o] == "")
147 print "png.h: exported symbol", o, "'" symbol[o] "' not present in", master 147 print "png.h: exported symbol", o, "'" symbol[o] "' not present in", master
148 else 148 else
149 print "png.h: exported symbol", o, "'" symbol[o] "' exists as '" official[o] "' in", master 149 print "png.h: exported symbol", o, "'" symbol[o] "' exists as '" official[o] "' in", master
150 } 150 }
151 151
152 # Finally generate symbols.new 152 # Finally generate symbols.new
153 if (symbol[o] != "") 153 if (symbol[o] != "")
154 print " " symbol[o], "@" o > "symbols.new" 154 print " " symbol[o], "@" o > "symbols.new"
155 } 155 }
156 156
157 if (err != 0) { 157 if (err != 0) {
158 print "*** A new list is in symbols.new ***" 158 print "*** A new list is in symbols.new ***"
159 exit 1 159 exit 1
160 } 160 }
161} 161}
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/chkfmt b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/chkfmt
index 80b4917..9da6475 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/chkfmt
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/chkfmt
@@ -1,137 +1,137 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# Check the format of the source files in the current directory - checks for a 3# Check the format of the source files in the current directory - checks for a
4# line length of 80 characters max and no tab characters. 4# line length of 80 characters max and no tab characters.
5# 5#
6# Optionally arguments are files or directories to check. 6# Optionally arguments are files or directories to check.
7# 7#
8# -v: output the long lines (makes fixing them easier) 8# -v: output the long lines (makes fixing them easier)
9# -e: spawn an editor for each file that needs a change ($EDITOR must be 9# -e: spawn an editor for each file that needs a change ($EDITOR must be
10# defined). When using -e the script MUST be run from an interactive 10# defined). When using -e the script MUST be run from an interactive
11# command line. 11# command line.
12verbose= 12verbose=
13edit= 13edit=
14vers= 14vers=
15test "$1" = "-v" && { 15test "$1" = "-v" && {
16 shift 16 shift
17 verbose=yes 17 verbose=yes
18} 18}
19test "$1" = "-e" && { 19test "$1" = "-e" && {
20 shift 20 shift
21 if test -n "$EDITOR" 21 if test -n "$EDITOR"
22 then 22 then
23 edit=yes 23 edit=yes
24 24
25 # Copy the standard streams for the editor 25 # Copy the standard streams for the editor
26 exec 3>&0 4>&1 5>&2 26 exec 3>&0 4>&1 5>&2
27 else 27 else
28 echo "chkfmt -e: EDITOR must be defined" >&2 28 echo "chkfmt -e: EDITOR must be defined" >&2
29 exit 1 29 exit 1
30 fi 30 fi
31} 31}
32 32
33# Function to edit a single file - if the file isn't changed ask the user 33# Function to edit a single file - if the file isn't changed ask the user
34# whether or not to continue. This stuff only works if the script is run from 34# whether or not to continue. This stuff only works if the script is run from
35# the command line (otherwise, don't specify -e or you will be sorry). 35# the command line (otherwise, don't specify -e or you will be sorry).
36doed(){ 36doed(){
37 cp "$file" "$file".orig 37 cp "$file" "$file".orig
38 "$EDITOR" "$file" 0>&3 1>&4 2>&5 3>&- 4>&- 5>&- || exit 1 38 "$EDITOR" "$file" 0>&3 1>&4 2>&5 3>&- 4>&- 5>&- || exit 1
39 if cmp -s "$file".orig "$file" 39 if cmp -s "$file".orig "$file"
40 then 40 then
41 rm "$file".orig 41 rm "$file".orig
42 echo -n "$file: file not changed, type anything to continue: " >&5 42 echo -n "$file: file not changed, type anything to continue: " >&5
43 read ans 0>&3 43 read ans 0>&3
44 test -n "$ans" || return 1 44 test -n "$ans" || return 1
45 fi 45 fi
46 return 0 46 return 0
47} 47}
48 48
49# In beta versions the version string which appears in files can be a little 49# In beta versions the version string which appears in files can be a little
50# long and cause spuriously overlong lines. To avoid this subtitute the version 50# long and cause spuriously overlong lines. To avoid this subtitute the version
51# string with a 'standard' version a.b.cc before checking for long lines. 51# string with a 'standard' version a.b.cc before checking for long lines.
52if test -r png.h 52if test -r png.h
53then 53then
54 vers="`sed -n -e \ 54 vers="`sed -n -e \
55 's/^#define PNG_LIBPNG_VER_STRING .\([0-9]\.[0-9]\.[0-9][0-9a-z]*\).$/\1/p' \ 55 's/^#define PNG_LIBPNG_VER_STRING .\([0-9]\.[0-9]\.[0-9][0-9a-z]*\).$/\1/p' \
56 png.h`" 56 png.h`"
57 echo "chkfmt: checking version $vers" 57 echo "chkfmt: checking version $vers"
58fi 58fi
59if test -z "$vers" 59if test -z "$vers"
60then 60then
61 echo "chkfmt: png.h not found, ignoring version number" >&2 61 echo "chkfmt: png.h not found, ignoring version number" >&2
62fi 62fi
63 63
64test -n "$1" || set -- . 64test -n "$1" || set -- .
65find "$@" \( -type d \( -name '.git' -o -name '.libs' -o -name 'projects' \) \ 65find "$@" \( -type d \( -name '.git' -o -name '.libs' -o -name 'projects' \) \
66 -prune \) -o \( -type f \ 66 -prune \) -o \( -type f \
67 ! -name '*.[oa]' ! -name '*.l[oa]' ! -name '*.png' ! -name '*.out' \ 67 ! -name '*.[oa]' ! -name '*.l[oa]' ! -name '*.png' ! -name '*.out' \
68 ! -name '*.jpg' ! -name '*.patch' ! -name '*.obj' ! -name '*.exe' \ 68 ! -name '*.jpg' ! -name '*.patch' ! -name '*.obj' ! -name '*.exe' \
69 ! -name '*.com' ! -name '*.tar.*' ! -name '*.zip' ! -name '*.ico' \ 69 ! -name '*.com' ! -name '*.tar.*' ! -name '*.zip' ! -name '*.ico' \
70 ! -name '*.res' ! -name '*.rc' ! -name '*.mms' ! -name '*.rej' \ 70 ! -name '*.res' ! -name '*.rc' ! -name '*.mms' ! -name '*.rej' \
71 ! -name '*.dsp' ! -name '*.orig' ! -name '*.dfn' ! -name '*.swp' \ 71 ! -name '*.dsp' ! -name '*.orig' ! -name '*.dfn' ! -name '*.swp' \
72 ! -name '~*' ! -name '*.3' \ 72 ! -name '~*' ! -name '*.3' \
73 ! -name 'missing' ! -name 'mkinstalldirs' ! -name 'depcomp' \ 73 ! -name 'missing' ! -name 'mkinstalldirs' ! -name 'depcomp' \
74 ! -name 'aclocal.m4' ! -name 'install-sh' ! -name 'Makefile.in' \ 74 ! -name 'aclocal.m4' ! -name 'install-sh' ! -name 'Makefile.in' \
75 ! -name 'ltmain.sh' ! -name 'config*' -print \) | { 75 ! -name 'ltmain.sh' ! -name 'config*' -print \) | {
76 st=0 76 st=0
77 while read file 77 while read file
78 do 78 do
79 case "$file" in 79 case "$file" in
80 *.mak|*[Mm]akefile.*|*[Mm]akefile) 80 *.mak|*[Mm]akefile.*|*[Mm]akefile)
81 # Makefiles require tabs, dependency lines can be this long. 81 # Makefiles require tabs, dependency lines can be this long.
82 check_tabs= 82 check_tabs=
83 line_length=100;; 83 line_length=100;;
84 *.awk) 84 *.awk)
85 # Includes literal tabs 85 # Includes literal tabs
86 check_tabs= 86 check_tabs=
87 # The following is arbitrary 87 # The following is arbitrary
88 line_length=132;; 88 line_length=132;;
89 *contrib/*/*.[ch]) 89 *contrib/*/*.[ch])
90 check_tabs=yes 90 check_tabs=yes
91 line_length=96;; 91 line_length=96;;
92 *) 92 *)
93 check_tabs=yes 93 check_tabs=yes
94 line_length=80;; 94 line_length=80;;
95 esac 95 esac
96 96
97 # Note that vers can only contain 0-9, . and a-z 97 # Note that vers can only contain 0-9, . and a-z
98 if test -n "$vers" 98 if test -n "$vers"
99 then 99 then
100 sed -e "s/$vers/a.b.cc/g" "$file" >"$file".$$ 100 sed -e "s/$vers/a.b.cc/g" "$file" >"$file".$$
101 else 101 else
102 cp "$file" "$file".$$ 102 cp "$file" "$file".$$
103 fi 103 fi
104 splt="`fold -$line_length "$file".$$ | diff -c "$file".$$ -`" 104 splt="`fold -$line_length "$file".$$ | diff -c "$file".$$ -`"
105 rm "$file".$$ 105 rm "$file".$$
106 106
107 if test -n "$splt" 107 if test -n "$splt"
108 then 108 then
109 echo "$file: lines too long" 109 echo "$file: lines too long"
110 st=1 110 st=1
111 if test -n "$EDITOR" -a -n "$edit" 111 if test -n "$EDITOR" -a -n "$edit"
112 then 112 then
113 doed "$file" || exit 1 113 doed "$file" || exit 1
114 elif test -n "$verbose" 114 elif test -n "$verbose"
115 then 115 then
116 echo "$splt" 116 echo "$splt"
117 fi 117 fi
118 fi 118 fi
119 if test -n "$check_tabs" 119 if test -n "$check_tabs"
120 then 120 then
121 tab="`tr -c -d '\t' <"$file"`" 121 tab="`tr -c -d '\t' <"$file"`"
122 if test -n "$tab" 122 if test -n "$tab"
123 then 123 then
124 echo "$file: file contains tab characters" 124 echo "$file: file contains tab characters"
125 st=1 125 st=1
126 if test -n "$EDITOR" -a -n "$edit" 126 if test -n "$EDITOR" -a -n "$edit"
127 then 127 then
128 doed "$file" || exit 1 128 doed "$file" || exit 1
129 elif test -n "$verbose" 129 elif test -n "$verbose"
130 then 130 then
131 echo "$splt" 131 echo "$splt"
132 fi 132 fi
133 fi 133 fi
134 fi 134 fi
135 done 135 done
136 exit $st 136 exit $st
137} 137}
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/def.dfn b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/def.dfn
index c7ed8ab..f991863 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/def.dfn
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/def.dfn
@@ -1,38 +1,38 @@
1/* def.dfn - define format of libpng.def 1/* def.dfn - define format of libpng.def
2 * 2 *
3 * Last changed in libpng version 1.5.7 [December 15, 2011] 3 * Last changed in libpng version 1.5.7 [December 15, 2011]
4 * Copyright (c) 2010-2011 Glenn Randers-Pehrson 4 * Copyright (c) 2010-2011 Glenn Randers-Pehrson
5 * 5 *
6 * This code is released under the libpng license. 6 * This code is released under the libpng license.
7 * For conditions of distribution and use, see the disclaimer 7 * For conditions of distribution and use, see the disclaimer
8 * and license in png.h 8 * and license in png.h
9 */ 9 */
10 10
11/* These macros exist to make the header and trailer shorter below: */ 11/* These macros exist to make the header and trailer shorter below: */
12#define S PNG_DEFN_MAGIC 12#define S PNG_DEFN_MAGIC
13#define E PNG_DEFN_END 13#define E PNG_DEFN_END
14 14
15/* Write the export file header: */ 15/* Write the export file header: */
16S-;---------------------------------------------------------------E 16S-;---------------------------------------------------------------E
17S-; LIBPNG module definition file for OS/2-E 17S-; LIBPNG module definition file for OS/2-E
18S-;---------------------------------------------------------------E 18S-;---------------------------------------------------------------E
19S--E 19S--E
20S-; If you give the library an explicit name one or other files-E 20S-; If you give the library an explicit name one or other files-E
21S-; may need modifying to support the new name on one or more-E 21S-; may need modifying to support the new name on one or more-E
22S-; systems.-E 22S-; systems.-E
23S-LIBRARY-E 23S-LIBRARY-E
24S-OS2 DESCRIPTION "PNG image compression library"-E 24S-OS2 DESCRIPTION "PNG image compression library"-E
25S-OS2 CODE PRELOAD MOVEABLE DISCARDABLE-E 25S-OS2 CODE PRELOAD MOVEABLE DISCARDABLE-E
26S--E 26S--E
27S-EXPORTS-E 27S-EXPORTS-E
28S-;Version 1.5.0beta58-E 28S-;Version 1.5.0beta58-E
29 29
30/* NOTE: PNG_JOIN is interpreted by the calling script as a signal to 30/* NOTE: PNG_JOIN is interpreted by the calling script as a signal to
31 * join the two things on either side, so we can do symbol 31 * join the two things on either side, so we can do symbol
32 * substitution within the name, regular C ## joins the pp-tokens, 32 * substitution within the name, regular C ## joins the pp-tokens,
33 * not their final values. 33 * not their final values.
34 */ 34 */
35#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ 35#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
36 PNG_DEFN_MAGIC- SYMBOL_PREFIX PNG_JOIN name-PNG_DEFN_END 36 PNG_DEFN_MAGIC- SYMBOL_PREFIX PNG_JOIN name-PNG_DEFN_END
37 37
38#include "../png.h" 38#include "../png.h"
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/descrip.mms b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/descrip.mms
index 9ba2d5f..99ea1ab 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/descrip.mms
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/descrip.mms
@@ -1,52 +1,52 @@
1 1
2cc_defs = /inc=$(ZLIBSRC) 2cc_defs = /inc=$(ZLIBSRC)
3c_deb = 3c_deb =
4 4
5.ifdef __DECC__ 5.ifdef __DECC__
6pref = /prefix=all 6pref = /prefix=all
7.endif 7.endif
8 8
9 9
10 10
11OBJS = png.obj, pngset.obj, pngget.obj, pngrutil.obj, pngtrans.obj,\ 11OBJS = png.obj, pngset.obj, pngget.obj, pngrutil.obj, pngtrans.obj,\
12 pngwutil.obj, pngread.obj, pngmem.obj, pngwrite.obj, pngrtran.obj,\ 12 pngwutil.obj, pngread.obj, pngmem.obj, pngwrite.obj, pngrtran.obj,\
13 pngwtran.obj, pngrio.obj, pngwio.obj, pngerror.obj, pngpread.obj 13 pngwtran.obj, pngrio.obj, pngwio.obj, pngerror.obj, pngpread.obj
14 14
15 15
16CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF) 16CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
17 17
18all : pngtest.exe libpng.olb 18all : pngtest.exe libpng.olb
19 @ write sys$output " pngtest available" 19 @ write sys$output " pngtest available"
20 20
21libpng.olb : libpng.olb($(OBJS)) 21libpng.olb : libpng.olb($(OBJS))
22 @ write sys$output " Libpng available" 22 @ write sys$output " Libpng available"
23 23
24 24
25pngtest.exe : pngtest.obj libpng.olb 25pngtest.exe : pngtest.obj libpng.olb
26 link pngtest,libpng.olb/lib,$(ZLIBSRC)libz.olb/lib 26 link pngtest,libpng.olb/lib,$(ZLIBSRC)libz.olb/lib
27 27
28test : pngtest.exe 28test : pngtest.exe
29 run pngtest 29 run pngtest
30 30
31clean : 31clean :
32 delete *.obj;*,*.exe; 32 delete *.obj;*,*.exe;
33 33
34 34
35# Other dependencies. 35# Other dependencies.
36png.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 36png.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
37pngpread.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 37pngpread.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
38pngset.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 38pngset.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
39pngget.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 39pngget.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
40pngread.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 40pngread.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
41pngrtran.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 41pngrtran.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
42pngrutil.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 42pngrutil.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
43pngerror.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 43pngerror.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
44pngmem.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 44pngmem.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
45pngrio.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 45pngrio.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
46pngwio.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 46pngwio.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
47pngtrans.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 47pngtrans.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
48pngwrite.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 48pngwrite.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
49pngwtran.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 49pngwtran.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
50pngwutil.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h 50pngwutil.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h, pnginfo.h, pngdebug.h
51 51
52pngtest.obj : png.h, pngconf.h 52pngtest.obj : png.h, pngconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-body.in b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-body.in
index 0db8898..b466432 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-body.in
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-body.in
@@ -1,96 +1,96 @@
1 1
2usage() 2usage()
3{ 3{
4 cat <<EOF 4 cat <<EOF
5Usage: libpng-config [OPTION] ... 5Usage: libpng-config [OPTION] ...
6 6
7Known values for OPTION are: 7Known values for OPTION are:
8 8
9 --prefix print libpng prefix 9 --prefix print libpng prefix
10 --libdir print path to directory containing library 10 --libdir print path to directory containing library
11 --libs print library linking information 11 --libs print library linking information
12 --ccopts print compiler options 12 --ccopts print compiler options
13 --cppflags print pre-processor flags 13 --cppflags print pre-processor flags
14 --cflags print preprocessor flags, I_opts, and compiler options 14 --cflags print preprocessor flags, I_opts, and compiler options
15 --I_opts print "-I" include options 15 --I_opts print "-I" include options
16 --L_opts print linker "-L" flags for dynamic linking 16 --L_opts print linker "-L" flags for dynamic linking
17 --R_opts print dynamic linker "-R" or "-rpath" flags 17 --R_opts print dynamic linker "-R" or "-rpath" flags
18 --ldopts print linker options 18 --ldopts print linker options
19 --ldflags print linker flags (ldopts, L_opts, R_opts, and libs) 19 --ldflags print linker flags (ldopts, L_opts, R_opts, and libs)
20 --static revise subsequent outputs for static linking 20 --static revise subsequent outputs for static linking
21 --help print this help and exit 21 --help print this help and exit
22 --version print version information 22 --version print version information
23EOF 23EOF
24 24
25 exit $1 25 exit $1
26} 26}
27 27
28if test $# -eq 0; then 28if test $# -eq 0; then
29 usage 1 29 usage 1
30fi 30fi
31 31
32while test $# -gt 0; do 32while test $# -gt 0; do
33 case "$1" in 33 case "$1" in
34 34
35 --prefix) 35 --prefix)
36 echo ${prefix} 36 echo ${prefix}
37 ;; 37 ;;
38 38
39 --version) 39 --version)
40 echo ${version} 40 echo ${version}
41 exit 0 41 exit 0
42 ;; 42 ;;
43 43
44 --help) 44 --help)
45 usage 0 45 usage 0
46 ;; 46 ;;
47 47
48 --ccopts) 48 --ccopts)
49 echo ${ccopts} 49 echo ${ccopts}
50 ;; 50 ;;
51 51
52 --cppflags) 52 --cppflags)
53 echo ${cppflags} 53 echo ${cppflags}
54 ;; 54 ;;
55 55
56 --cflags) 56 --cflags)
57 echo ${I_opts} ${cppflags} ${ccopts} 57 echo ${I_opts} ${cppflags} ${ccopts}
58 ;; 58 ;;
59 59
60 --libdir) 60 --libdir)
61 echo ${libdir} 61 echo ${libdir}
62 ;; 62 ;;
63 63
64 --libs) 64 --libs)
65 echo ${libs} 65 echo ${libs}
66 ;; 66 ;;
67 67
68 --I_opts) 68 --I_opts)
69 echo ${I_opts} 69 echo ${I_opts}
70 ;; 70 ;;
71 71
72 --L_opts) 72 --L_opts)
73 echo ${L_opts} 73 echo ${L_opts}
74 ;; 74 ;;
75 75
76 --R_opts) 76 --R_opts)
77 echo ${R_opts} 77 echo ${R_opts}
78 ;; 78 ;;
79 79
80 --ldflags) 80 --ldflags)
81 echo ${ldflags} ${L_opts} ${R_opts} ${libs} 81 echo ${ldflags} ${L_opts} ${R_opts} ${libs}
82 ;; 82 ;;
83 83
84 --static) 84 --static)
85 R_opts="" 85 R_opts=""
86 ;; 86 ;;
87 87
88 *) 88 *)
89 usage 89 usage
90 exit 1 90 exit 1
91 ;; 91 ;;
92 esac 92 esac
93 shift 93 shift
94done 94done
95 95
96exit 0 96exit 0
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-head.in b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-head.in
index 154bb39..a8ba194 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-head.in
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng-config-head.in
@@ -1,24 +1,24 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# libpng-config 3# libpng-config
4# provides configuration info for libpng. 4# provides configuration info for libpng.
5 5
6# Copyright (C) 2002 Glenn Randers-Pehrson 6# Copyright (C) 2002 Glenn Randers-Pehrson
7 7
8# This code is released under the libpng license. 8# This code is released under the libpng license.
9# For conditions of distribution and use, see the disclaimer 9# For conditions of distribution and use, see the disclaimer
10# and license in png.h 10# and license in png.h
11 11
12# Modeled after libxml-config. 12# Modeled after libxml-config.
13 13
14version=1.5.9 14version=1.5.9
15prefix="" 15prefix=""
16libdir="" 16libdir=""
17libs="" 17libs=""
18I_opts="" 18I_opts=""
19L_opts="" 19L_opts=""
20R_opts="" 20R_opts=""
21cppflags="" 21cppflags=""
22ccopts="" 22ccopts=""
23ldopts="" 23ldopts=""
24 24
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng.pc.in b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng.pc.in
index 2f647c2..a90e641 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng.pc.in
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/libpng.pc.in
@@ -1,10 +1,10 @@
1prefix=@prefix@ 1prefix=@prefix@
2exec_prefix=@exec_prefix@ 2exec_prefix=@exec_prefix@
3libdir=@libdir@ 3libdir=@libdir@
4includedir=@includedir@/libpng15 4includedir=@includedir@/libpng15
5 5
6Name: libpng 6Name: libpng
7Description: Loads and saves PNG files 7Description: Loads and saves PNG files
8Version: 1.5.9 8Version: 1.5.9
9Libs: -L${libdir} -lpng15 9Libs: -L${libdir} -lpng15
10Cflags: -I${includedir} 10Cflags: -I${includedir}
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.32sunu b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.32sunu
index a6279ad..b5e5a33 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.32sunu
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.32sunu
@@ -1,241 +1,241 @@
1# makefile for libpng on Solaris 2.x with cc 1# makefile for libpng on Solaris 2.x with cc
2# Contributed by William L. Sebok, based on makefile.linux 2# Contributed by William L. Sebok, based on makefile.linux
3# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson 3# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
4# Copyright (C) 1998 Greg Roelofs 4# Copyright (C) 1998 Greg Roelofs
5# Copyright (C) 1996, 1997 Andreas Dilger 5# Copyright (C) 1996, 1997 Andreas Dilger
6 6
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# Library name: 11# Library name:
12LIBNAME=libpng15 12LIBNAME=libpng15
13PNGMAJ = 15 13PNGMAJ = 15
14 14
15# Shared library names: 15# Shared library names:
16LIBSO=$(LIBNAME).so 16LIBSO=$(LIBNAME).so
17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
18LIBSOREL=$(LIBSOMAJ).$(RELEASE) 18LIBSOREL=$(LIBSOMAJ).$(RELEASE)
19OLDSO=libpng.so 19OLDSO=libpng.so
20 20
21# Utilities: 21# Utilities:
22CC=cc 22CC=cc
23AR_RC=ar rc 23AR_RC=ar rc
24MKDIR_P=mkdir -p 24MKDIR_P=mkdir -p
25LN_SF=ln -f -s 25LN_SF=ln -f -s
26RANLIB=echo 26RANLIB=echo
27RM_F=/bin/rm -f 27RM_F=/bin/rm -f
28 28
29SUN_CC_FLAGS=-fast -xtarget=ultra 29SUN_CC_FLAGS=-fast -xtarget=ultra
30SUN_LD_FLAGS=-fast -xtarget=ultra 30SUN_LD_FLAGS=-fast -xtarget=ultra
31 31
32# where make install puts libpng.a, libpng15.so and libpng15/png.h 32# where make install puts libpng.a, libpng15.so and libpng15/png.h
33prefix=/a 33prefix=/a
34exec_prefix=$(prefix) 34exec_prefix=$(prefix)
35 35
36# Where the zlib library and include files are located 36# Where the zlib library and include files are located
37# Changing these to ../zlib poses a security risk. If you want 37# Changing these to ../zlib poses a security risk. If you want
38# to have zlib in an adjacent directory, specify the full path instead of "..". 38# to have zlib in an adjacent directory, specify the full path instead of "..".
39#ZLIBLIB=../zlib 39#ZLIBLIB=../zlib
40#ZLIBINC=../zlib 40#ZLIBINC=../zlib
41 41
42ZLIBLIB=/usr/lib 42ZLIBLIB=/usr/lib
43ZLIBINC=/usr/include 43ZLIBINC=/usr/include
44 44
45WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 45WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
46 -Wmissing-declarations -Wtraditional -Wcast-align \ 46 -Wmissing-declarations -Wtraditional -Wcast-align \
47 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 47 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
48CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ 48CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \
49 # $(WARNMORE) -g -DPNG_DEBUG=5 49 # $(WARNMORE) -g -DPNG_DEBUG=5
50LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm 50LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
51 51
52INCPATH=$(prefix)/include 52INCPATH=$(prefix)/include
53LIBPATH=$(exec_prefix)/lib 53LIBPATH=$(exec_prefix)/lib
54MANPATH=$(prefix)/man 54MANPATH=$(prefix)/man
55BINPATH=$(exec_prefix)/bin 55BINPATH=$(exec_prefix)/bin
56 56
57# override DESTDIR= on the make install command line to easily support 57# override DESTDIR= on the make install command line to easily support
58# installing into a temporary location. Example: 58# installing into a temporary location. Example:
59# 59#
60# make install DESTDIR=/tmp/build/libpng 60# make install DESTDIR=/tmp/build/libpng
61# 61#
62# If you're going to install into a temporary location 62# If you're going to install into a temporary location
63# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 63# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
64# you execute make install. 64# you execute make install.
65DESTDIR= 65DESTDIR=
66 66
67DB=$(DESTDIR)$(BINPATH) 67DB=$(DESTDIR)$(BINPATH)
68DI=$(DESTDIR)$(INCPATH) 68DI=$(DESTDIR)$(INCPATH)
69DL=$(DESTDIR)$(LIBPATH) 69DL=$(DESTDIR)$(LIBPATH)
70DM=$(DESTDIR)$(MANPATH) 70DM=$(DESTDIR)$(MANPATH)
71 71
72OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 72OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
73 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 73 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
74 pngwtran.o pngmem.o pngerror.o pngpread.o 74 pngwtran.o pngmem.o pngerror.o pngpread.o
75 75
76OBJSDLL = $(OBJS:.o=.pic.o) 76OBJSDLL = $(OBJS:.o=.pic.o)
77 77
78.SUFFIXES: .c .o .pic.o 78.SUFFIXES: .c .o .pic.o
79 79
80.c.pic.o: 80.c.pic.o:
81 $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c 81 $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
82 82
83all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 83all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
84 84
85include scripts/pnglibconf.mak 85include scripts/pnglibconf.mak
86DELETE = $(RM_F) 86DELETE = $(RM_F)
87DFNFLAGS = $(DEFS) $(CPPFLAGS) 87DFNFLAGS = $(DEFS) $(CPPFLAGS)
88 88
89libpng.a: $(OBJS) 89libpng.a: $(OBJS)
90 $(AR_RC) $@ $(OBJS) 90 $(AR_RC) $@ $(OBJS)
91 $(RANLIB) $@ 91 $(RANLIB) $@
92 92
93libpng.pc: 93libpng.pc:
94 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 94 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
95 -e s!@exec_prefix@!$(exec_prefix)! \ 95 -e s!@exec_prefix@!$(exec_prefix)! \
96 -e s!@libdir@!$(LIBPATH)! \ 96 -e s!@libdir@!$(LIBPATH)! \
97 -e s!@includedir@!$(INCPATH)! \ 97 -e s!@includedir@!$(INCPATH)! \
98 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 98 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
99 99
100libpng-config: 100libpng-config:
101 ( cat scripts/libpng-config-head.in; \ 101 ( cat scripts/libpng-config-head.in; \
102 echo prefix=\"$(prefix)\"; \ 102 echo prefix=\"$(prefix)\"; \
103 echo libdir=\"$(LIBPATH)\"; \ 103 echo libdir=\"$(LIBPATH)\"; \
104 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 104 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
105 echo L_opts=\"-L$(LIBPATH)\"; \ 105 echo L_opts=\"-L$(LIBPATH)\"; \
106 echo R_opts=\"-R$(LIBPATH)\"; \ 106 echo R_opts=\"-R$(LIBPATH)\"; \
107 echo ccopts=\"-xtarget=ultra\"; \ 107 echo ccopts=\"-xtarget=ultra\"; \
108 echo ldopts=\"-xtarget=ultra\"; \ 108 echo ldopts=\"-xtarget=ultra\"; \
109 echo libs=\"-lpng15 -lz -lm\"; \ 109 echo libs=\"-lpng15 -lz -lm\"; \
110 cat scripts/libpng-config-body.in ) > libpng-config 110 cat scripts/libpng-config-body.in ) > libpng-config
111 chmod +x libpng-config 111 chmod +x libpng-config
112 112
113$(LIBSO): $(LIBSOMAJ) 113$(LIBSO): $(LIBSOMAJ)
114 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 114 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
115 115
116$(LIBSOMAJ): $(OBJSDLL) 116$(LIBSOMAJ): $(OBJSDLL)
117 @case "`type ld`" in *ucb*) \ 117 @case "`type ld`" in *ucb*) \
118 echo; \ 118 echo; \
119 echo '## WARNING:'; \ 119 echo '## WARNING:'; \
120 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \ 120 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \
121 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \ 121 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \
122 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \ 122 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \
123 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \ 123 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \
124 echo '## at all. If it is, things are likely to break because of'; \ 124 echo '## at all. If it is, things are likely to break because of'; \
125 echo '## the libucb dependency that is created.'; \ 125 echo '## the libucb dependency that is created.'; \
126 echo; \ 126 echo; \
127 ;; \ 127 ;; \
128 esac 128 esac
129 $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \ 129 $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \
130 -o $(LIBSOMAJ) $(OBJSDLL) 130 -o $(LIBSOMAJ) $(OBJSDLL)
131 131
132pngtest: pngtest.o $(LIBSO) 132pngtest: pngtest.o $(LIBSO)
133 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 133 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
134 134
135test: pngtest 135test: pngtest
136 ./pngtest 136 ./pngtest
137 137
138install-headers: png.h pngconf.h pnglibconf.h 138install-headers: png.h pngconf.h pnglibconf.h
139 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 139 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
140 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 140 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
141 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 141 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
142 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 142 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
143 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 143 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
144 -@$(RM_F) $(DI)/libpng 144 -@$(RM_F) $(DI)/libpng
145 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 145 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
146 146
147install-static: install-headers libpng.a 147install-static: install-headers libpng.a
148 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 148 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
149 cp libpng.a $(DL)/$(LIBNAME).a 149 cp libpng.a $(DL)/$(LIBNAME).a
150 chmod 644 $(DL)/$(LIBNAME).a 150 chmod 644 $(DL)/$(LIBNAME).a
151 -@$(RM_F) $(DL)/libpng.a 151 -@$(RM_F) $(DL)/libpng.a
152 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 152 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
153 153
154install-shared: install-headers $(LIBSOMAJ) libpng.pc 154install-shared: install-headers $(LIBSOMAJ) libpng.pc
155 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 155 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
156 -@$(RM_F) $(DL)/$(LIBSO) 156 -@$(RM_F) $(DL)/$(LIBSO)
157 -@$(RM_F) $(DL)/$(LIBSOREL) 157 -@$(RM_F) $(DL)/$(LIBSOREL)
158 -@$(RM_F) $(DL)/$(OLDSO) 158 -@$(RM_F) $(DL)/$(OLDSO)
159 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 159 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
160 chmod 755 $(DL)/$(LIBSOREL) 160 chmod 755 $(DL)/$(LIBSOREL)
161 (cd $(DL); \ 161 (cd $(DL); \
162 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 162 $(LN_SF) $(LIBSOREL) $(LIBSO); \
163 $(LN_SF) $(LIBSO) $(OLDSO)) 163 $(LN_SF) $(LIBSO) $(OLDSO))
164 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 164 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
165 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 165 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
166 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 166 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
167 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 167 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
168 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 168 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
169 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 169 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
170 170
171install-man: libpng.3 libpngpf.3 png.5 171install-man: libpng.3 libpngpf.3 png.5
172 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 172 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
173 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 173 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
174 -@$(RM_F) $(DM)/man3/libpng.3 174 -@$(RM_F) $(DM)/man3/libpng.3
175 -@$(RM_F) $(DM)/man3/libpngpf.3 175 -@$(RM_F) $(DM)/man3/libpngpf.3
176 cp libpng.3 $(DM)/man3 176 cp libpng.3 $(DM)/man3
177 cp libpngpf.3 $(DM)/man3 177 cp libpngpf.3 $(DM)/man3
178 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 178 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
179 -@$(RM_F) $(DM)/man5/png.5 179 -@$(RM_F) $(DM)/man5/png.5
180 cp png.5 $(DM)/man5 180 cp png.5 $(DM)/man5
181 181
182install-config: libpng-config 182install-config: libpng-config
183 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 183 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
184 -@$(RM_F) $(DB)/libpng-config 184 -@$(RM_F) $(DB)/libpng-config
185 -@$(RM_F) $(DB)/$(LIBNAME)-config 185 -@$(RM_F) $(DB)/$(LIBNAME)-config
186 cp libpng-config $(DB)/$(LIBNAME)-config 186 cp libpng-config $(DB)/$(LIBNAME)-config
187 chmod 755 $(DB)/$(LIBNAME)-config 187 chmod 755 $(DB)/$(LIBNAME)-config
188 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 188 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
189 189
190install: install-static install-shared install-man install-config 190install: install-static install-shared install-man install-config
191 191
192# If you installed in $(DESTDIR), test-installed won't work until you 192# If you installed in $(DESTDIR), test-installed won't work until you
193# move the library to its final location. Use test-dd to test it 193# move the library to its final location. Use test-dd to test it
194# before then. 194# before then.
195 195
196test-dd: 196test-dd:
197 echo 197 echo
198 echo Testing installed dynamic shared library in $(DL). 198 echo Testing installed dynamic shared library in $(DL).
199 $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \ 199 $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \
200 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 200 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
201 -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 201 -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \
202 $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) 202 $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
203 ./pngtestd pngtest.png 203 ./pngtestd pngtest.png
204 204
205test-installed: 205test-installed:
206 echo 206 echo
207 echo Testing installed dynamic shared library. 207 echo Testing installed dynamic shared library.
208 $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \ 208 $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \
209 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 209 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
210 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 210 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
211 $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) 211 $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
212 ./pngtesti pngtest.png 212 ./pngtesti pngtest.png
213 213
214clean: 214clean:
215 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ 215 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
216 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 216 libpng-config $(LIBSO) $(LIBSOMAJ)* \
217 libpng.pc 217 libpng.pc
218 218
219DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 219DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
220writelock: 220writelock:
221 chmod a-w *.[ch35] $(DOCS) scripts/* 221 chmod a-w *.[ch35] $(DOCS) scripts/*
222 222
223# DO NOT DELETE THIS LINE -- make depend depends on it. 223# DO NOT DELETE THIS LINE -- make depend depends on it.
224 224
225png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 227pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
228pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 228pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
229pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 229pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
230pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 230pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
231pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 231pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
232pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 232pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
233pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 233pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
234pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 234pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
235pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 235pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
236pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 236pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
237pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 237pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
238pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 238pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
239pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 239pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
240 240
241pngtest.o: png.h pngconf.h pnglibconf.h 241pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.64sunu b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.64sunu
index 5a5195d..a0331d6 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.64sunu
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.64sunu
@@ -1,241 +1,241 @@
1# makefile for libpng on Solaris 2.x with cc 1# makefile for libpng on Solaris 2.x with cc
2# Contributed by William L. Sebok, based on makefile.linux 2# Contributed by William L. Sebok, based on makefile.linux
3# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson 3# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
4# Copyright (C) 1998 Greg Roelofs 4# Copyright (C) 1998 Greg Roelofs
5# Copyright (C) 1996, 1997 Andreas Dilger 5# Copyright (C) 1996, 1997 Andreas Dilger
6 6
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# Library name: 11# Library name:
12LIBNAME=libpng15 12LIBNAME=libpng15
13PNGMAJ = 15 13PNGMAJ = 15
14 14
15# Shared library names: 15# Shared library names:
16LIBSO=$(LIBNAME).so 16LIBSO=$(LIBNAME).so
17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
18LIBSOREL=$(LIBSOMAJ).$(RELEASE) 18LIBSOREL=$(LIBSOMAJ).$(RELEASE)
19OLDSO=libpng.so 19OLDSO=libpng.so
20 20
21# Utilities: 21# Utilities:
22CC=cc 22CC=cc
23AR_RC=ar rc 23AR_RC=ar rc
24MKDIR_P=mkdir -p 24MKDIR_P=mkdir -p
25LN_SF=ln -f -s 25LN_SF=ln -f -s
26RANLIB=echo 26RANLIB=echo
27RM_F=/bin/rm -f 27RM_F=/bin/rm -f
28 28
29SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9 29SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9
30SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9 30SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9
31 31
32# where make install puts libpng.a, libpng15.so and libpng15/png.h 32# where make install puts libpng.a, libpng15.so and libpng15/png.h
33prefix=/a 33prefix=/a
34exec_prefix=$(prefix) 34exec_prefix=$(prefix)
35 35
36# Where the zlib library and include files are located 36# Where the zlib library and include files are located
37# Changing these to ../zlib poses a security risk. If you want 37# Changing these to ../zlib poses a security risk. If you want
38# to have zlib in an adjacent directory, specify the full path instead of "..". 38# to have zlib in an adjacent directory, specify the full path instead of "..".
39#ZLIBLIB=../zlib 39#ZLIBLIB=../zlib
40#ZLIBINC=../zlib 40#ZLIBINC=../zlib
41 41
42ZLIBLIB=/usr/lib 42ZLIBLIB=/usr/lib
43ZLIBINC=/usr/include 43ZLIBINC=/usr/include
44 44
45WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 45WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
46 -Wmissing-declarations -Wtraditional -Wcast-align \ 46 -Wmissing-declarations -Wtraditional -Wcast-align \
47 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 47 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
48CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ 48CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \
49 # $(WARNMORE) -g -DPNG_DEBUG=5 49 # $(WARNMORE) -g -DPNG_DEBUG=5
50LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm 50LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
51 51
52INCPATH=$(prefix)/include 52INCPATH=$(prefix)/include
53LIBPATH=$(exec_prefix)/lib 53LIBPATH=$(exec_prefix)/lib
54MANPATH=$(prefix)/man 54MANPATH=$(prefix)/man
55BINPATH=$(exec_prefix)/bin 55BINPATH=$(exec_prefix)/bin
56 56
57# override DESTDIR= on the make install command line to easily support 57# override DESTDIR= on the make install command line to easily support
58# installing into a temporary location. Example: 58# installing into a temporary location. Example:
59# 59#
60# make install DESTDIR=/tmp/build/libpng 60# make install DESTDIR=/tmp/build/libpng
61# 61#
62# If you're going to install into a temporary location 62# If you're going to install into a temporary location
63# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 63# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
64# you execute make install. 64# you execute make install.
65DESTDIR= 65DESTDIR=
66 66
67DB=$(DESTDIR)$(BINPATH) 67DB=$(DESTDIR)$(BINPATH)
68DI=$(DESTDIR)$(INCPATH) 68DI=$(DESTDIR)$(INCPATH)
69DL=$(DESTDIR)$(LIBPATH) 69DL=$(DESTDIR)$(LIBPATH)
70DM=$(DESTDIR)$(MANPATH) 70DM=$(DESTDIR)$(MANPATH)
71 71
72OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 72OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
73 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 73 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
74 pngwtran.o pngmem.o pngerror.o pngpread.o 74 pngwtran.o pngmem.o pngerror.o pngpread.o
75 75
76OBJSDLL = $(OBJS:.o=.pic.o) 76OBJSDLL = $(OBJS:.o=.pic.o)
77 77
78.SUFFIXES: .c .o .pic.o 78.SUFFIXES: .c .o .pic.o
79 79
80.c.pic.o: 80.c.pic.o:
81 $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c 81 $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
82 82
83all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 83all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
84 84
85include scripts/pnglibconf.mak 85include scripts/pnglibconf.mak
86DELETE = $(RM_F) 86DELETE = $(RM_F)
87DFNFLAGS = $(DEFS) $(CPPFLAGS) 87DFNFLAGS = $(DEFS) $(CPPFLAGS)
88 88
89libpng.a: $(OBJS) 89libpng.a: $(OBJS)
90 $(AR_RC) $@ $(OBJS) 90 $(AR_RC) $@ $(OBJS)
91 $(RANLIB) $@ 91 $(RANLIB) $@
92 92
93libpng.pc: 93libpng.pc:
94 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 94 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
95 -e s!@exec_prefix@!$(exec_prefix)! \ 95 -e s!@exec_prefix@!$(exec_prefix)! \
96 -e s!@libdir@!$(LIBPATH)! \ 96 -e s!@libdir@!$(LIBPATH)! \
97 -e s!@includedir@!$(INCPATH)! \ 97 -e s!@includedir@!$(INCPATH)! \
98 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 98 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
99 99
100libpng-config: 100libpng-config:
101 ( cat scripts/libpng-config-head.in; \ 101 ( cat scripts/libpng-config-head.in; \
102 echo prefix=\"$(prefix)\"; \ 102 echo prefix=\"$(prefix)\"; \
103 echo libdir=\"$(LIBPATH)\"; \ 103 echo libdir=\"$(LIBPATH)\"; \
104 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 104 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
105 echo L_opts=\"-L$(LIBPATH)\"; \ 105 echo L_opts=\"-L$(LIBPATH)\"; \
106 echo R_opts=\"-R$(LIBPATH)\"; \ 106 echo R_opts=\"-R$(LIBPATH)\"; \
107 echo ccopts=\"-xtarget=ultra -xarch=v9\"; \ 107 echo ccopts=\"-xtarget=ultra -xarch=v9\"; \
108 echo ldopts=\"-xtarget=ultra -xarch=v9\"; \ 108 echo ldopts=\"-xtarget=ultra -xarch=v9\"; \
109 echo libs=\"-lpng15 -lz -lm\"; \ 109 echo libs=\"-lpng15 -lz -lm\"; \
110 cat scripts/libpng-config-body.in ) > libpng-config 110 cat scripts/libpng-config-body.in ) > libpng-config
111 chmod +x libpng-config 111 chmod +x libpng-config
112 112
113$(LIBSO): $(LIBSOMAJ) 113$(LIBSO): $(LIBSOMAJ)
114 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 114 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
115 115
116$(LIBSOMAJ): $(OBJSDLL) 116$(LIBSOMAJ): $(OBJSDLL)
117 @case "`type ld`" in *ucb*) \ 117 @case "`type ld`" in *ucb*) \
118 echo; \ 118 echo; \
119 echo '## WARNING:'; \ 119 echo '## WARNING:'; \
120 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \ 120 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \
121 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \ 121 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \
122 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \ 122 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \
123 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \ 123 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \
124 echo '## at all. If it is, things are likely to break because of'; \ 124 echo '## at all. If it is, things are likely to break because of'; \
125 echo '## the libucb dependency that is created.'; \ 125 echo '## the libucb dependency that is created.'; \
126 echo; \ 126 echo; \
127 ;; \ 127 ;; \
128 esac 128 esac
129 $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \ 129 $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \
130 -o $(LIBSOMAJ) $(OBJSDLL) 130 -o $(LIBSOMAJ) $(OBJSDLL)
131 131
132pngtest: pngtest.o $(LIBSO) 132pngtest: pngtest.o $(LIBSO)
133 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 133 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
134 134
135test: pngtest 135test: pngtest
136 ./pngtest 136 ./pngtest
137 137
138install-headers: png.h pngconf.h 138install-headers: png.h pngconf.h
139 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 139 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
140 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 140 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
141 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 141 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
142 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 142 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
143 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 143 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
144 -@$(RM_F) $(DI)/libpng 144 -@$(RM_F) $(DI)/libpng
145 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 145 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
146 146
147install-static: install-headers libpng.a 147install-static: install-headers libpng.a
148 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 148 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
149 cp libpng.a $(DL)/$(LIBNAME).a 149 cp libpng.a $(DL)/$(LIBNAME).a
150 chmod 644 $(DL)/$(LIBNAME).a 150 chmod 644 $(DL)/$(LIBNAME).a
151 -@$(RM_F) $(DL)/libpng.a 151 -@$(RM_F) $(DL)/libpng.a
152 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 152 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
153 153
154install-shared: install-headers $(LIBSOMAJ) libpng.pc 154install-shared: install-headers $(LIBSOMAJ) libpng.pc
155 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 155 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
156 -@$(RM_F) $(DL)/$(LIBSO) 156 -@$(RM_F) $(DL)/$(LIBSO)
157 -@$(RM_F) $(DL)/$(LIBSOREL) 157 -@$(RM_F) $(DL)/$(LIBSOREL)
158 -@$(RM_F) $(DL)/$(OLDSO) 158 -@$(RM_F) $(DL)/$(OLDSO)
159 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 159 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
160 chmod 755 $(DL)/$(LIBSOREL) 160 chmod 755 $(DL)/$(LIBSOREL)
161 (cd $(DL); \ 161 (cd $(DL); \
162 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 162 $(LN_SF) $(LIBSOREL) $(LIBSO); \
163 $(LN_SF) $(LIBSO) $(OLDSO)) 163 $(LN_SF) $(LIBSO) $(OLDSO))
164 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 164 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
165 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 165 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
166 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 166 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
167 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 167 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
168 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 168 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
169 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 169 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
170 170
171install-man: libpng.3 libpngpf.3 png.5 171install-man: libpng.3 libpngpf.3 png.5
172 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 172 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
173 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 173 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
174 -@$(RM_F) $(DM)/man3/libpng.3 174 -@$(RM_F) $(DM)/man3/libpng.3
175 -@$(RM_F) $(DM)/man3/libpngpf.3 175 -@$(RM_F) $(DM)/man3/libpngpf.3
176 cp libpng.3 $(DM)/man3 176 cp libpng.3 $(DM)/man3
177 cp libpngpf.3 $(DM)/man3 177 cp libpngpf.3 $(DM)/man3
178 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 178 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
179 -@$(RM_F) $(DM)/man5/png.5 179 -@$(RM_F) $(DM)/man5/png.5
180 cp png.5 $(DM)/man5 180 cp png.5 $(DM)/man5
181 181
182install-config: libpng-config 182install-config: libpng-config
183 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 183 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
184 -@$(RM_F) $(DB)/libpng-config 184 -@$(RM_F) $(DB)/libpng-config
185 -@$(RM_F) $(DB)/$(LIBNAME)-config 185 -@$(RM_F) $(DB)/$(LIBNAME)-config
186 cp libpng-config $(DB)/$(LIBNAME)-config 186 cp libpng-config $(DB)/$(LIBNAME)-config
187 chmod 755 $(DB)/$(LIBNAME)-config 187 chmod 755 $(DB)/$(LIBNAME)-config
188 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 188 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
189 189
190install: install-static install-shared install-man install-config 190install: install-static install-shared install-man install-config
191 191
192# If you installed in $(DESTDIR), test-installed won't work until you 192# If you installed in $(DESTDIR), test-installed won't work until you
193# move the library to its final location. Use test-dd to test it 193# move the library to its final location. Use test-dd to test it
194# before then. 194# before then.
195 195
196test-dd: 196test-dd:
197 echo 197 echo
198 echo Testing installed dynamic shared library in $(DL). 198 echo Testing installed dynamic shared library in $(DL).
199 $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \ 199 $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \
200 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 200 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
201 -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 201 -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \
202 $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) 202 $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
203 ./pngtestd pngtest.png 203 ./pngtestd pngtest.png
204 204
205test-installed: 205test-installed:
206 echo 206 echo
207 echo Testing installed dynamic shared library. 207 echo Testing installed dynamic shared library.
208 $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \ 208 $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \
209 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 209 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
210 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 210 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
211 $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) 211 $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
212 ./pngtesti pngtest.png 212 ./pngtesti pngtest.png
213 213
214clean: 214clean:
215 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ 215 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
216 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 216 libpng-config $(LIBSO) $(LIBSOMAJ)* \
217 libpng.pc 217 libpng.pc
218 218
219DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 219DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
220writelock: 220writelock:
221 chmod a-w *.[ch35] $(DOCS) scripts/* 221 chmod a-w *.[ch35] $(DOCS) scripts/*
222 222
223# DO NOT DELETE THIS LINE -- make depend depends on it. 223# DO NOT DELETE THIS LINE -- make depend depends on it.
224 224
225png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 227pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
228pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 228pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
229pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 229pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
230pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 230pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
231pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 231pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
232pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 232pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
233pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 233pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
234pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 234pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
235pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 235pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
236pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 236pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
237pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 237pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
238pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 238pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
239pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 239pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
240 240
241pngtest.o: png.h pngconf.h pnglibconf.h 241pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.acorn b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.acorn
index 4181913..00b8fb5 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.acorn
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.acorn
@@ -1,57 +1,57 @@
1# Project: libpng 1# Project: libpng
2 2
3 3
4# Toolflags: 4# Toolflags:
5CCflags = -c -depend !Depend -IC:,Zlib: -g -throwback -DRISCOS -fnah 5CCflags = -c -depend !Depend -IC:,Zlib: -g -throwback -DRISCOS -fnah
6C++flags = -c -depend !Depend -IC: -throwback 6C++flags = -c -depend !Depend -IC: -throwback
7Linkflags = -aif -c++ -o $@ 7Linkflags = -aif -c++ -o $@
8ObjAsmflags = -throwback -NoCache -depend !Depend 8ObjAsmflags = -throwback -NoCache -depend !Depend
9CMHGflags = 9CMHGflags =
10LibFileflags = -c -l -o $@ 10LibFileflags = -c -l -o $@
11Squeezeflags = -o $@ 11Squeezeflags = -o $@
12 12
13# Final targets: 13# Final targets:
14@.libpng-lib: @.o.png @.o.pngerror @.o.pngrio @.o.pngwio @.o.pngmem \ 14@.libpng-lib: @.o.png @.o.pngerror @.o.pngrio @.o.pngwio @.o.pngmem \
15 @.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngrtran \ 15 @.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngrtran \
16 @.o.pngrutil @.o.pngtrans @.o.pngwrite @.o.pngwtran @.o.pngwutil 16 @.o.pngrutil @.o.pngtrans @.o.pngwrite @.o.pngwtran @.o.pngwutil
17 LibFile $(LibFileflags) @.o.png @.o.pngerror @.o.pngrio @.o.pngrtran \ 17 LibFile $(LibFileflags) @.o.png @.o.pngerror @.o.pngrio @.o.pngrtran \
18 @.o.pngmem @.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngwio \ 18 @.o.pngmem @.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngwio \
19 @.o.pngrutil @.o.pngtrans @.o.pngwrite @.o.pngwtran @.o.pngwutil 19 @.o.pngrutil @.o.pngtrans @.o.pngwrite @.o.pngwtran @.o.pngwutil
20@.mm-libpng-lib: @.mm.png @.mm.pngerror @.mm.pngrio @.mm.pngwio @.mm.pngmem \ 20@.mm-libpng-lib: @.mm.png @.mm.pngerror @.mm.pngrio @.mm.pngwio @.mm.pngmem \
21 @.mm.pngpread @.mm.pngset @.mm.pngget @.mm.pngread @.mm.pngrtran \ 21 @.mm.pngpread @.mm.pngset @.mm.pngget @.mm.pngread @.mm.pngrtran \
22 @.mm.pngrutil @.mm.pngtrans @.mm.pngwrite @.mm.pngwtran @.mm.pngwutil 22 @.mm.pngrutil @.mm.pngtrans @.mm.pngwrite @.mm.pngwtran @.mm.pngwutil
23 LibFile $(LibFileflags) @.mm.png @.mm.pngerror @.mm.pngrio \ 23 LibFile $(LibFileflags) @.mm.png @.mm.pngerror @.mm.pngrio \
24 @.mm.pngwio @.mm.pngmem @.mm.pngpread @.mm.pngset @.mm.pngget \ 24 @.mm.pngwio @.mm.pngmem @.mm.pngpread @.mm.pngset @.mm.pngget \
25 @.mm.pngread @.mm.pngrtran @.mm.pngrutil @.mm.pngtrans @.mm.pngwrite \ 25 @.mm.pngread @.mm.pngrtran @.mm.pngrutil @.mm.pngtrans @.mm.pngwrite \
26 @.mm.pngwtran @.mm.pngwutil 26 @.mm.pngwtran @.mm.pngwutil
27 27
28 28
29# User-editable dependencies: 29# User-editable dependencies:
30# (C) Copyright 1997 Tom Tanner 30# (C) Copyright 1997 Tom Tanner
31Test: @.pngtest 31Test: @.pngtest
32 <Prefix$Dir>.pngtest 32 <Prefix$Dir>.pngtest
33 @remove <Prefix$Dir>.pngtest 33 @remove <Prefix$Dir>.pngtest
34 34
35#It would be nice if you could stop "make" listing from here on! 35#It would be nice if you could stop "make" listing from here on!
36@.pngtest: @.o.pngtest @.libpng-lib C:o.Stubs Zlib:zlib_lib 36@.pngtest: @.o.pngtest @.libpng-lib C:o.Stubs Zlib:zlib_lib
37 Link $(Linkflags) @.o.pngtest @.libpng-lib C:o.Stubs Zlib:zlib_lib 37 Link $(Linkflags) @.o.pngtest @.libpng-lib C:o.Stubs Zlib:zlib_lib
38 38
39.SUFFIXES: .o .mm .c 39.SUFFIXES: .o .mm .c
40 40
41.c.mm: 41.c.mm:
42 MemCheck.CC cc $(ccflags) -o $@ LibPng:$< 42 MemCheck.CC cc $(ccflags) -o $@ LibPng:$<
43.c.o: 43.c.o:
44 cc $(ccflags) -o $@ $< 44 cc $(ccflags) -o $@ $<
45 45
46# See scripts.mak.libpngconf for how to generate this: 46# See scripts.mak.libpngconf for how to generate this:
47@.h.libpngconf: @.scripts.h.libpngconf 47@.h.libpngconf: @.scripts.h.libpngconf
48 copy @.scripts.h.libpngconf $@ 48 copy @.scripts.h.libpngconf $@
49 49
50# Static dependencies: 50# Static dependencies:
51@.o.png @.o.pngerror @.o.pngrio @.o.pngwio @.o.pngmem \ 51@.o.png @.o.pngerror @.o.pngrio @.o.pngwio @.o.pngmem \
52@.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngrtran \ 52@.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngrtran \
53@.o.pngrutil @.o.pngtrans @.o.pngwrite @.o.pngwtran @.o.pngwutil \ 53@.o.pngrutil @.o.pngtrans @.o.pngwrite @.o.pngwtran @.o.pngwutil \
54@.o.pngtest: @.h.libpngconf 54@.o.pngtest: @.h.libpngconf
55 55
56 56
57# Dynamic dependencies: 57# Dynamic dependencies:
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.aix b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.aix
index 1b1e18f..bb4c40d 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.aix
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.aix
@@ -1,121 +1,121 @@
1# makefile for libpng using gcc (generic, static library) 1# makefile for libpng using gcc (generic, static library)
2# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson 2# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson
3# Copyright (C) 2000 Cosmin Truta 3# Copyright (C) 2000 Cosmin Truta
4# Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc) 4# Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
5# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 5# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
6# 6#
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# Location of the zlib library and include files 11# Location of the zlib library and include files
12ZLIBINC = ../zlib 12ZLIBINC = ../zlib
13ZLIBLIB = ../zlib 13ZLIBLIB = ../zlib
14 14
15# Compiler, linker, lib and other tools 15# Compiler, linker, lib and other tools
16CC = gcc 16CC = gcc
17LD = $(CC) 17LD = $(CC)
18AR_RC = ar rcs 18AR_RC = ar rcs
19MKDIR_P = mkdir -p 19MKDIR_P = mkdir -p
20RANLIB = ranlib 20RANLIB = ranlib
21RM_F = rm -f 21RM_F = rm -f
22LN_SF = ln -f -s 22LN_SF = ln -f -s
23 23
24LIBNAME=libpng15 24LIBNAME=libpng15
25PNGMAJ = 15 25PNGMAJ = 15
26 26
27prefix=/usr/local 27prefix=/usr/local
28INCPATH=$(prefix)/include 28INCPATH=$(prefix)/include
29LIBPATH=$(prefix)/lib 29LIBPATH=$(prefix)/lib
30 30
31# override DESTDIR= on the make install command line to easily support 31# override DESTDIR= on the make install command line to easily support
32# installing into a temporary location. Example: 32# installing into a temporary location. Example:
33# 33#
34# make install DESTDIR=/tmp/build/libpng 34# make install DESTDIR=/tmp/build/libpng
35# 35#
36# If you're going to install into a temporary location 36# If you're going to install into a temporary location
37# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 37# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
38# you execute make install. 38# you execute make install.
39DESTDIR= 39DESTDIR=
40 40
41DI=$(DESTDIR)$(INCPATH) 41DI=$(DESTDIR)$(INCPATH)
42DL=$(DESTDIR)$(LIBPATH) 42DL=$(DESTDIR)$(LIBPATH)
43 43
44CDEBUG = -g -DPNG_DEBUG=5 44CDEBUG = -g -DPNG_DEBUG=5
45LDDEBUG = 45LDDEBUG =
46CRELEASE = -O2 46CRELEASE = -O2
47LDRELEASE = -s 47LDRELEASE = -s
48WARNMORE=-W -Wall 48WARNMORE=-W -Wall
49CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) 49CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
50LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE) 50LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE)
51 51
52# File extensions 52# File extensions
53O=.o 53O=.o
54A=.a 54A=.a
55E= 55E=
56 56
57# Variables 57# Variables
58OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ 58OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
59 pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \ 59 pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
60 pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) 60 pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
61 61
62# Targets 62# Targets
63all: $(LIBNAME)$(A) pngtest$(E) 63all: $(LIBNAME)$(A) pngtest$(E)
64 64
65include scripts/pnglibconf.mak 65include scripts/pnglibconf.mak
66REMOVE = $(RM_F) 66REMOVE = $(RM_F)
67DFNFLAGS = $(DEFS) $(CPPFLAGS) 67DFNFLAGS = $(DEFS) $(CPPFLAGS)
68 68
69$(LIBNAME)$(A): $(OBJS) 69$(LIBNAME)$(A): $(OBJS)
70 $(AR_RC) $@ $(OBJS) 70 $(AR_RC) $@ $(OBJS)
71 $(RANLIB) $@ 71 $(RANLIB) $@
72 72
73test: pngtest$(E) 73test: pngtest$(E)
74 ./pngtest$(E) 74 ./pngtest$(E)
75 75
76pngtest$(E): pngtest$(O) $(LIBNAME)$(A) 76pngtest$(E): pngtest$(O) $(LIBNAME)$(A)
77 $(LD) -o $@ pngtest$(O) $(LDFLAGS) 77 $(LD) -o $@ pngtest$(O) $(LDFLAGS)
78 78
79install: $(LIBNAME)$(A) 79install: $(LIBNAME)$(A)
80 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 80 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
81 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 81 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
82 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 82 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
83 -@$(RM_F) $(DI)/$(LIBNAME)/png.h 83 -@$(RM_F) $(DI)/$(LIBNAME)/png.h
84 -@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h 84 -@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h
85 -@$(RM_F) $(DI)/$(LIBNAME)/pnglibconf.h 85 -@$(RM_F) $(DI)/$(LIBNAME)/pnglibconf.h
86 -@$(RM_F) $(DI)/png.h 86 -@$(RM_F) $(DI)/png.h
87 -@$(RM_F) $(DI)/pngconf.h 87 -@$(RM_F) $(DI)/pngconf.h
88 -@$(RM_F) $(DI)/pnglibconf.h 88 -@$(RM_F) $(DI)/pnglibconf.h
89 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 89 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
90 chmod 644 $(DI)/$(LIBNAME)/png.h \ 90 chmod 644 $(DI)/$(LIBNAME)/png.h \
91 $(DI)/$(LIBNAME)/pngconf.h \ 91 $(DI)/$(LIBNAME)/pngconf.h \
92 $(DI)/$(LIBNAME)/pnglibconf.h 92 $(DI)/$(LIBNAME)/pnglibconf.h
93 -@$(RM_F) -r $(DI)/libpng 93 -@$(RM_F) -r $(DI)/libpng
94 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 94 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
95 -@$(RM_F) $(DL)/$(LIBNAME)$(A) 95 -@$(RM_F) $(DL)/$(LIBNAME)$(A)
96 -@$(RM_F) $(DL)/libpng$(A) 96 -@$(RM_F) $(DL)/libpng$(A)
97 cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A) 97 cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A)
98 chmod 644 $(DL)/$(LIBNAME)$(A) 98 chmod 644 $(DL)/$(LIBNAME)$(A)
99 (cd $(DL); $(LN_SF) $(LIBNAME)$(A) libpng$(A)) 99 (cd $(DL); $(LN_SF) $(LIBNAME)$(A) libpng$(A))
100 (cd $(DI); $(LN_SF) libpng/* .;) 100 (cd $(DI); $(LN_SF) libpng/* .;)
101 101
102clean: 102clean:
103 $(RM_F) *.o $(LIBNAME)$(A) pngtest pngout.png pnglibconf.h 103 $(RM_F) *.o $(LIBNAME)$(A) pngtest pngout.png pnglibconf.h
104 104
105png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 105png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
106pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 106pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
107pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 107pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
108pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 108pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
109pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 109pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
110pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 110pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
111pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 111pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
112pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 112pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
113pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 113pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
114pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 114pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
115pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 115pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
116pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 116pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
117pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 117pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
118pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 118pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
119pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 119pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
120 120
121pngtest$(O): png.h pngconf.h pnglibconf.h 121pngtest$(O): png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.amiga b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.amiga
index f23f254..228b5c2 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.amiga
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.amiga
@@ -1,56 +1,56 @@
1# Commodore Amiga Makefile 1# Commodore Amiga Makefile
2# makefile for libpng and SAS C V6.5x compiler 2# makefile for libpng and SAS C V6.5x compiler
3# Copyright (C) 1995-2000 Wolf Faust 3# Copyright (C) 1995-2000 Wolf Faust
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# Location/path of zlib include files 9# Location/path of zlib include files
10ZLIB=/zlib 10ZLIB=/zlib
11#compiler 11#compiler
12CC=sc 12CC=sc
13#compiler flags 13#compiler flags
14# WARNING: a bug in V6.51 causes bad code with OPTGO 14# WARNING: a bug in V6.51 causes bad code with OPTGO
15# So use V6.55 or set NOOPTGO!!!!!!!!! 15# So use V6.55 or set NOOPTGO!!!!!!!!!
16CFLAGS= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\ 16CFLAGS= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\
17 OPTLOOP OPTRDEP=4 OPTDEP=4 OPTCOMP=4 INCLUDEDIR=$(ZLIB) \ 17 OPTLOOP OPTRDEP=4 OPTDEP=4 OPTCOMP=4 INCLUDEDIR=$(ZLIB) \
18 DEFINE=PNG_INTERNAL 18 DEFINE=PNG_INTERNAL
19#linker flags 19#linker flags
20LDFLAGS= SD ND BATCH 20LDFLAGS= SD ND BATCH
21#link libs 21#link libs
22LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib 22LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib
23# linker 23# linker
24LN= slink 24LN= slink
25# file deletion command 25# file deletion command
26RM= delete quiet 26RM= delete quiet
27# file copy command? 27# file copy command?
28CP= copy 28CP= copy
29# library (.lib) file creation command 29# library (.lib) file creation command
30AR= oml 30AR= oml
31# make directory command 31# make directory command
32MKDIR= makedir 32MKDIR= makedir
33 33
34OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 34OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
35 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 35 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
36 pngwtran.o pngmem.o pngerror.o pngpread.o 36 pngwtran.o pngmem.o pngerror.o pngpread.o
37 37
38all: libpng.lib pngtest 38all: libpng.lib pngtest
39 39
40libpng.lib: $(OBJS) 40libpng.lib: $(OBJS)
41-$(RM) libpng.lib 41-$(RM) libpng.lib
42$(AR) libpng.lib r $(OBJS) 42$(AR) libpng.lib r $(OBJS)
43 43
44$(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h 44$(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h
45 45
46pnglibconf.h: scripts/pnglibconf.h.prebuilt 46pnglibconf.h: scripts/pnglibconf.h.prebuilt
47$(CP) scripts/pnglibconf.h.prebuilt pnglibconf.h 47$(CP) scripts/pnglibconf.h.prebuilt pnglibconf.h
48 48
49pngtest: pngtest.o libpng.lib 49pngtest: pngtest.o libpng.lib
50$(LN) <WITH < 50$(LN) <WITH <
51$(LDFLAGS) 51$(LDFLAGS)
52TO pngtest 52TO pngtest
53FROM LIB:c.o pngtest.o 53FROM LIB:c.o pngtest.o
54LIB $(LDLIBS) 54LIB $(LDLIBS)
55< 55<
56 56
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.atari b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.atari
index aa28ce5..1aeb7d5 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.atari
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.atari
@@ -1,63 +1,63 @@
1# makefile for libpng 1# makefile for libpng
2# Copyright (C) 2002 Glenn Randers-Pehrson 2# Copyright (C) 2002 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# Modified for LC56/ATARI assumes libz.lib is in same dir and uses default 9# Modified for LC56/ATARI assumes libz.lib is in same dir and uses default
10# rules for library management 10# rules for library management
11# 11#
12CFLAGS=-I..\zlib -O 12CFLAGS=-I..\zlib -O
13LBR = png.lib 13LBR = png.lib
14LDFLAGS=-lpng -lz -lm 14LDFLAGS=-lpng -lz -lm
15 15
16# where make install puts libpng.a and png.h 16# where make install puts libpng.a and png.h
17prefix=/usr/local 17prefix=/usr/local
18INCPATH=$(prefix)/include 18INCPATH=$(prefix)/include
19LIBPATH=$(prefix)/lib 19LIBPATH=$(prefix)/lib
20 20
21# override DESTDIR= on the make install command line to easily support 21# override DESTDIR= on the make install command line to easily support
22# installing into a temporary location. Example: 22# installing into a temporary location. Example:
23# 23#
24# make install DESTDIR=/tmp/build/libpng 24# make install DESTDIR=/tmp/build/libpng
25# 25#
26# If you're going to install into a temporary location 26# If you're going to install into a temporary location
27# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 27# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
28# you execute make install. 28# you execute make install.
29DESTDIR= 29DESTDIR=
30 30
31OBJS = $(LBR)(png.o) $(LBR)(pngset.o) $(LBR)(pngget.o) $(LBR)(pngrutil.o)\ 31OBJS = $(LBR)(png.o) $(LBR)(pngset.o) $(LBR)(pngget.o) $(LBR)(pngrutil.o)\
32 $(LBR)(pngtrans.o) $(LBR)(pngwutil.o)\ 32 $(LBR)(pngtrans.o) $(LBR)(pngwutil.o)\
33 $(LBR)(pngread.o) $(LBR)(pngerror.o) $(LBR)(pngwrite.o)\ 33 $(LBR)(pngread.o) $(LBR)(pngerror.o) $(LBR)(pngwrite.o)\
34 $(LBR)(pngrtran.o) $(LBR)(pngwtran.o)\ 34 $(LBR)(pngrtran.o) $(LBR)(pngwtran.o)\
35 $(LBR)(pngmem.o) $(LBR)(pngrio.o) $(LBR)(pngwio.o) $(LBR)(pngpread.o) 35 $(LBR)(pngmem.o) $(LBR)(pngrio.o) $(LBR)(pngwio.o) $(LBR)(pngpread.o)
36 36
37all: $(LBR) pngtest.ttp 37all: $(LBR) pngtest.ttp
38 38
39$(LBR): $(OBJS) 39$(LBR): $(OBJS)
40 40
41$(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h 41$(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h
42 42
43pnglibconf.h: scripts/pnglibconf.h.prebuilt 43pnglibconf.h: scripts/pnglibconf.h.prebuilt
44 cp scripts/pnglibconf.h.prebuilt pnglibconf.h 44 cp scripts/pnglibconf.h.prebuilt pnglibconf.h
45 45
46pngtest.ttp: pngtest.o $(LBR) 46pngtest.ttp: pngtest.o $(LBR)
47 $(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o 47 $(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o
48 48
49install: libpng.a 49install: libpng.a
50 -@mkdir $(DESTDIR)$(INCPATH) 50 -@mkdir $(DESTDIR)$(INCPATH)
51 -@mkdir $(DESTDIR)$(INCPATH)/libpng 51 -@mkdir $(DESTDIR)$(INCPATH)/libpng
52 -@mkdir $(DESTDIR)$(LIBPATH) 52 -@mkdir $(DESTDIR)$(LIBPATH)
53 -@rm -f $(DESTDIR)$(INCPATH)/png.h 53 -@rm -f $(DESTDIR)$(INCPATH)/png.h
54 -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h 54 -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
55 -@rm -f $(DESTDIR)$(INCPATH)/pnglibconf.h 55 -@rm -f $(DESTDIR)$(INCPATH)/pnglibconf.h
56 cp png.h $(DESTDIR)$(INCPATH)/libpng 56 cp png.h $(DESTDIR)$(INCPATH)/libpng
57 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng 57 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
58 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng 58 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
59 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h 59 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
60 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h 60 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
61 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h 61 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
62 (cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \ 62 (cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
63 ln -f -s $(LIBNAME)/* .) 63 ln -f -s $(LIBNAME)/* .)
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bc32 b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bc32
index 48311e9..ebbd5ce 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bc32
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bc32
@@ -1,151 +1,151 @@
1# Makefile for libpng 1# Makefile for libpng
2# 32-bit Borland C++ (Note: All modules are compiled in C mode) 2# 32-bit Borland C++ (Note: All modules are compiled in C mode)
3# To build the library, do: 3# To build the library, do:
4# "make -fmakefile.bc32" 4# "make -fmakefile.bc32"
5# 5#
6# -------------------- 32-bit Borland C++ -------------------- 6# -------------------- 32-bit Borland C++ --------------------
7 7
8### Absolutely necessary for this makefile to work 8### Absolutely necessary for this makefile to work
9.AUTODEPEND 9.AUTODEPEND
10 10
11## Where zlib.h, zconf.h and zlib.lib are 11## Where zlib.h, zconf.h and zlib.lib are
12ZLIB_DIR=..\zlib 12ZLIB_DIR=..\zlib
13 13
14## Compiler, linker and lib stuff 14## Compiler, linker and lib stuff
15CC=bcc32 15CC=bcc32
16LD=bcc32 16LD=bcc32
17LIB=tlib 17LIB=tlib
18 18
19# -3 = 386, -4 = 486, -5 = Pentium etc. 19# -3 = 386, -4 = 486, -5 = Pentium etc.
20!ifndef TARGET_CPU 20!ifndef TARGET_CPU
21#TARGET_CPU=-6 21#TARGET_CPU=-6
22!endif 22!endif
23 23
24# Use this if you don't want Borland's fancy exception handling 24# Use this if you don't want Borland's fancy exception handling
25# (Caution: doesn't work with CBuilderX) 25# (Caution: doesn't work with CBuilderX)
26#NOEHLIB=noeh32.lib 26#NOEHLIB=noeh32.lib
27 27
28!ifdef DEBUG 28!ifdef DEBUG
29CDEBUG=-v 29CDEBUG=-v
30LDEBUG=-v 30LDEBUG=-v
31!else 31!else
32CDEBUG= 32CDEBUG=
33LDEBUG= 33LDEBUG=
34!endif 34!endif
35 35
36# STACKOFLOW=1 36# STACKOFLOW=1
37!ifdef STACKOFLOW 37!ifdef STACKOFLOW
38CDEBUG=$(CDEBUG) -N 38CDEBUG=$(CDEBUG) -N
39LDEBUG=$(LDEBUG) -N 39LDEBUG=$(LDEBUG) -N
40!endif 40!endif
41 41
42# -O2 optimize for speed 42# -O2 optimize for speed
43# -d merge duplicate strings 43# -d merge duplicate strings
44# -k- turn off standard stack frame 44# -k- turn off standard stack frame
45# -w display all warnings 45# -w display all warnings
46CFLAGS=-I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) 46CFLAGS=-I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG)
47 47
48# -M generate map file 48# -M generate map file
49LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG) 49LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG)
50 50
51## Variables 51## Variables
52OBJS = \ 52OBJS = \
53 png.obj \ 53 png.obj \
54 pngerror.obj \ 54 pngerror.obj \
55 pngget.obj \ 55 pngget.obj \
56 pngmem.obj \ 56 pngmem.obj \
57 pngpread.obj \ 57 pngpread.obj \
58 pngread.obj \ 58 pngread.obj \
59 pngrio.obj \ 59 pngrio.obj \
60 pngrtran.obj \ 60 pngrtran.obj \
61 pngrutil.obj \ 61 pngrutil.obj \
62 pngset.obj \ 62 pngset.obj \
63 pngtrans.obj \ 63 pngtrans.obj \
64 pngwio.obj \ 64 pngwio.obj \
65 pngwrite.obj \ 65 pngwrite.obj \
66 pngwtran.obj \ 66 pngwtran.obj \
67 pngwutil.obj 67 pngwutil.obj
68 68
69LIBOBJS = \ 69LIBOBJS = \
70 +png.obj \ 70 +png.obj \
71 +pngerror.obj \ 71 +pngerror.obj \
72 +pngget.obj \ 72 +pngget.obj \
73 +pngmem.obj \ 73 +pngmem.obj \
74 +pngpread.obj \ 74 +pngpread.obj \
75 +pngread.obj \ 75 +pngread.obj \
76 +pngrio.obj \ 76 +pngrio.obj \
77 +pngrtran.obj \ 77 +pngrtran.obj \
78 +pngrutil.obj \ 78 +pngrutil.obj \
79 +pngset.obj \ 79 +pngset.obj \
80 +pngtrans.obj \ 80 +pngtrans.obj \
81 +pngwio.obj \ 81 +pngwio.obj \
82 +pngwrite.obj \ 82 +pngwrite.obj \
83 +pngwtran.obj \ 83 +pngwtran.obj \
84 +pngwutil.obj 84 +pngwutil.obj
85 85
86LIBNAME=libpng.lib 86LIBNAME=libpng.lib
87 87
88## Implicit rules 88## Implicit rules
89# Braces let make "batch" calls to the compiler, 89# Braces let make "batch" calls to the compiler,
90# 2 calls instead of 12; space is important. 90# 2 calls instead of 12; space is important.
91.c.obj: 91.c.obj:
92 $(CC) $(CFLAGS) -c {$*.c } 92 $(CC) $(CFLAGS) -c {$*.c }
93 93
94.c.exe: 94.c.exe:
95 $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib.lib $(NOEHLIB) 95 $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib.lib $(NOEHLIB)
96 96
97.obj.exe: 97.obj.exe:
98 $(LD) $(LDFLAGS) $*.obj $(LIBNAME) zlib.lib $(NOEHLIB) 98 $(LD) $(LDFLAGS) $*.obj $(LIBNAME) zlib.lib $(NOEHLIB)
99 99
100## Major targets 100## Major targets
101all: libpng pngtest 101all: libpng pngtest
102 102
103libpng: $(LIBNAME) 103libpng: $(LIBNAME)
104 104
105pngtest: pngtest.exe 105pngtest: pngtest.exe
106 106
107test: pngtest.exe 107test: pngtest.exe
108 pngtest 108 pngtest
109 109
110## Minor Targets 110## Minor Targets
111 111
112# see scripts\pnglibconf.mak for how to make this file 112# see scripts\pnglibconf.mak for how to make this file
113# with different options 113# with different options
114pnglibconf.h: scripts\pnglibconf.h.prebuilt 114pnglibconf.h: scripts\pnglibconf.h.prebuilt
115 copy scripts\pnglibconf.h.prebuilt $@ 115 copy scripts\pnglibconf.h.prebuilt $@
116 116
117png.obj: png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 117png.obj: png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
118pngerror.obj: pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 118pngerror.obj: pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
119pngget.obj: pngget.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 119pngget.obj: pngget.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
120pngmem.obj: pngmem.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 120pngmem.obj: pngmem.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
121pngpread.obj: pngpread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 121pngpread.obj: pngpread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
122pngread.obj: pngread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 122pngread.obj: pngread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
123pngrio.obj: pngrio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 123pngrio.obj: pngrio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
124pngrtran.obj: pngrtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 124pngrtran.obj: pngrtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
125pngrutil.obj: pngrutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 125pngrutil.obj: pngrutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
126pngset.obj: pngset.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 126pngset.obj: pngset.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
127pngtrans.obj: pngtrans.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 127pngtrans.obj: pngtrans.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
128pngwio.obj: pngwio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 128pngwio.obj: pngwio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
129pngwrite.obj: pngwrite.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 129pngwrite.obj: pngwrite.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
130pngwtran.obj: pngwtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 130pngwtran.obj: pngwtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
131pngwutil.obj: pngwutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 131pngwutil.obj: pngwutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
132pngtest.obj: pngtest.c png.h pngconf.h pnglibconf.h 132pngtest.obj: pngtest.c png.h pngconf.h pnglibconf.h
133 133
134$(LIBNAME): $(OBJS) 134$(LIBNAME): $(OBJS)
135 -del $(LIBNAME) 135 -del $(LIBNAME)
136 $(LIB) $(LIBNAME) @&&| 136 $(LIB) $(LIBNAME) @&&|
137$(LIBOBJS), libpng 137$(LIBOBJS), libpng
138| 138|
139 139
140# Cleanup 140# Cleanup
141clean: 141clean:
142 -del pnglibconf.h 142 -del pnglibconf.h
143 -del *.obj 143 -del *.obj
144 -del $(LIBNAME) 144 -del $(LIBNAME)
145 -del pngtest.exe 145 -del pngtest.exe
146 -del *.lst 146 -del *.lst
147 -del *.map 147 -del *.map
148 -del *.tds 148 -del *.tds
149 -del pngout.png 149 -del pngout.png
150 150
151# End of makefile for libpng 151# End of makefile for libpng
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.beos b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.beos
index ff1743c..749db78 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.beos
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.beos
@@ -1,215 +1,215 @@
1# makefile for libpng on BeOS x86 ELF with gcc 1# makefile for libpng on BeOS x86 ELF with gcc
2# modified from makefile.linux by Sander Stoks 2# modified from makefile.linux by Sander Stoks
3# Copyright (C) 2002, 2006, 2008, 2010-2011 Glenn Randers-Pehrson 3# Copyright (C) 2002, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
4# Copyright (C) 1999 Greg Roelofs 4# Copyright (C) 1999 Greg Roelofs
5# Copyright (C) 1996, 1997 Andreas Dilger 5# Copyright (C) 1996, 1997 Andreas Dilger
6# 6#
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# Library name: 11# Library name:
12LIBNAME=libpng15 12LIBNAME=libpng15
13PNGMAJ = 15 13PNGMAJ = 15
14 14
15# Shared library names: 15# Shared library names:
16LIBSO=$(LIBNAME).so 16LIBSO=$(LIBNAME).so
17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
18LIBSOREL=$(LIBSOMAJ).$(RELEASE) 18LIBSOREL=$(LIBSOMAJ).$(RELEASE)
19OLDSO=libpng.so 19OLDSO=libpng.so
20 20
21# Utilities: 21# Utilities:
22CC=gcc 22CC=gcc
23AR_RC=ar rc 23AR_RC=ar rc
24MKDIR_P=mkdir -p 24MKDIR_P=mkdir -p
25LN_SF=ln -sf 25LN_SF=ln -sf
26RANLIB=ranlib 26RANLIB=ranlib
27RM_F=/bin/rm -f 27RM_F=/bin/rm -f
28 28
29# Where the zlib library and include files are located 29# Where the zlib library and include files are located
30ZLIBLIB=/usr/local/lib 30ZLIBLIB=/usr/local/lib
31ZLIBINC=/usr/local/include 31ZLIBINC=/usr/local/include
32 32
33ALIGN= 33ALIGN=
34# For i386: 34# For i386:
35# ALIGN=-malign-loops=2 -malign-functions=2 35# ALIGN=-malign-loops=2 -malign-functions=2
36 36
37WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 37WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
38 -Wmissing-declarations -Wtraditional -Wcast-align \ 38 -Wmissing-declarations -Wtraditional -Wcast-align \
39 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 39 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
40 40
41# On BeOS, -O1 is actually better than -O3. This is a known bug but it's 41# On BeOS, -O1 is actually better than -O3. This is a known bug but it's
42# still here in R4.5 42# still here in R4.5
43CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \ 43CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \
44 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 44 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
45# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz 45# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz
46LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz 46LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz
47 47
48# where make install puts libpng.a, libpng15.so*, and png.h 48# where make install puts libpng.a, libpng15.so*, and png.h
49prefix=/usr/local 49prefix=/usr/local
50exec_prefix=$(prefix) 50exec_prefix=$(prefix)
51INCPATH=$(prefix)/include 51INCPATH=$(prefix)/include
52LIBPATH=$(exec_prefix)/lib 52LIBPATH=$(exec_prefix)/lib
53MANPATH=$(prefix)/man 53MANPATH=$(prefix)/man
54BINPATH=$(exec_prefix)/bin 54BINPATH=$(exec_prefix)/bin
55 55
56# override DESTDIR= on the make install command line to easily support 56# override DESTDIR= on the make install command line to easily support
57# installing into a temporary location. Example: 57# installing into a temporary location. Example:
58# 58#
59# make install DESTDIR=/tmp/build/libpng 59# make install DESTDIR=/tmp/build/libpng
60# 60#
61# If you're going to install into a temporary location 61# If you're going to install into a temporary location
62# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 62# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
63# you execute make install. 63# you execute make install.
64DESTDIR= 64DESTDIR=
65 65
66DB=$(DESTDIR)$(BINPATH) 66DB=$(DESTDIR)$(BINPATH)
67DI=$(DESTDIR)$(INCPATH) 67DI=$(DESTDIR)$(INCPATH)
68DL=$(DESTDIR)$(LIBPATH) 68DL=$(DESTDIR)$(LIBPATH)
69DM=$(DESTDIR)$(MANPATH) 69DM=$(DESTDIR)$(MANPATH)
70 70
71OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 71OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
72 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 72 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
73 pngwtran.o pngmem.o pngerror.o pngpread.o 73 pngwtran.o pngmem.o pngerror.o pngpread.o
74 74
75OBJSDLL = $(OBJS) 75OBJSDLL = $(OBJS)
76 76
77.SUFFIXES: .c .o 77.SUFFIXES: .c .o
78 78
79all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 79all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
80 80
81# try include scripts/pnglibconf.mak for more options 81# try include scripts/pnglibconf.mak for more options
82pnglibconf.h: scripts/pnglibconf.h.prebuilt 82pnglibconf.h: scripts/pnglibconf.h.prebuilt
83 cp scripts/pnglibconf.h.prebuilt $@ 83 cp scripts/pnglibconf.h.prebuilt $@
84 84
85libpng.a: $(OBJS) 85libpng.a: $(OBJS)
86 $(AR_RC) $@ $(OBJS) 86 $(AR_RC) $@ $(OBJS)
87 $(RANLIB) $@ 87 $(RANLIB) $@
88 88
89libpng.pc: 89libpng.pc:
90 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 90 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
91 -e s!@exec_prefix@!$(exec_prefix)! \ 91 -e s!@exec_prefix@!$(exec_prefix)! \
92 -e s!@libdir@!$(LIBPATH)! \ 92 -e s!@libdir@!$(LIBPATH)! \
93 -e s!@includedir@!$(INCPATH)! \ 93 -e s!@includedir@!$(INCPATH)! \
94 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 94 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
95 95
96libpng-config: 96libpng-config:
97 ( cat scripts/libpng-config-head.in; \ 97 ( cat scripts/libpng-config-head.in; \
98 echo prefix=\"$(prefix)\"; \ 98 echo prefix=\"$(prefix)\"; \
99 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 99 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
100 echo libs=\"-lpng15 -lz \"; \ 100 echo libs=\"-lpng15 -lz \"; \
101 cat scripts/libpng-config-body.in ) > libpng-config 101 cat scripts/libpng-config-body.in ) > libpng-config
102 chmod +x libpng-config 102 chmod +x libpng-config
103 103
104$(LIBSO): $(LIBSOMAJ) 104$(LIBSO): $(LIBSOMAJ)
105 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 105 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
106 cp $(LIBSO)* /boot/home/config/lib 106 cp $(LIBSO)* /boot/home/config/lib
107 107
108$(LIBSOMAJ): $(OBJSDLL) 108$(LIBSOMAJ): $(OBJSDLL)
109 $(CC) -nostart -Wl,-soname,$(LIBSOMAJ) -o \ 109 $(CC) -nostart -Wl,-soname,$(LIBSOMAJ) -o \
110 $(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS) 110 $(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS)
111 111
112pngtest: pngtest.o $(LIBSO) 112pngtest: pngtest.o $(LIBSO)
113 $(CC) -L$(ZLIBLIB) -L. -lz -lpng15 -o pngtest pngtest.o 113 $(CC) -L$(ZLIBLIB) -L. -lz -lpng15 -o pngtest pngtest.o
114 114
115test: pngtest 115test: pngtest
116 ./pngtest 116 ./pngtest
117 117
118install-headers: png.h pngconf.h pnglibconf.h 118install-headers: png.h pngconf.h pnglibconf.h
119 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 119 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
120 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 120 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
121 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 121 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
122 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 122 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
123 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 123 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
124 -@$(RM_F) $(DI)/libpng 124 -@$(RM_F) $(DI)/libpng
125 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 125 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
126 126
127install-static: install-headers libpng.a 127install-static: install-headers libpng.a
128 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 128 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
129 cp libpng.a $(DL)/$(LIBNAME).a 129 cp libpng.a $(DL)/$(LIBNAME).a
130 chmod 644 $(DL)/$(LIBNAME).a 130 chmod 644 $(DL)/$(LIBNAME).a
131 -@$(RM_F) $(DL)/libpng.a 131 -@$(RM_F) $(DL)/libpng.a
132 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 132 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
133 133
134install-shared: install-headers $(LIBSOMAJ) libpng.pc 134install-shared: install-headers $(LIBSOMAJ) libpng.pc
135 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 135 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
136 -@$(RM_F) $(DL)/$(LIBSO) 136 -@$(RM_F) $(DL)/$(LIBSO)
137 -@$(RM_F) $(DL)/$(LIBSOREL) 137 -@$(RM_F) $(DL)/$(LIBSOREL)
138 -@$(RM_F) $(DL)/$(OLDSO) 138 -@$(RM_F) $(DL)/$(OLDSO)
139 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 139 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
140 chmod 755 $(DL)/$(LIBSOREL) 140 chmod 755 $(DL)/$(LIBSOREL)
141 (cd $(DL); \ 141 (cd $(DL); \
142 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 142 $(LN_SF) $(LIBSOREL) $(LIBSO); \
143 $(LN_SF) $(LIBSO) $(OLDSO)) 143 $(LN_SF) $(LIBSO) $(OLDSO))
144 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 144 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
145 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 145 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
146 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 146 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
147 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 147 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
148 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 148 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
149 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 149 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
150 150
151install-man: libpng.3 libpngpf.3 png.5 151install-man: libpng.3 libpngpf.3 png.5
152 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 152 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
153 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 153 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
154 -@$(RM_F) $(DM)/man3/libpng.3 154 -@$(RM_F) $(DM)/man3/libpng.3
155 -@$(RM_F) $(DM)/man3/libpngpf.3 155 -@$(RM_F) $(DM)/man3/libpngpf.3
156 cp libpng.3 $(DM)/man3 156 cp libpng.3 $(DM)/man3
157 cp libpngpf.3 $(DM)/man3 157 cp libpngpf.3 $(DM)/man3
158 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 158 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
159 -@$(RM_F) $(DM)/man5/png.5 159 -@$(RM_F) $(DM)/man5/png.5
160 cp png.5 $(DM)/man5 160 cp png.5 $(DM)/man5
161 161
162install-config: libpng-config 162install-config: libpng-config
163 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 163 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
164 -@$(RM_F) $(DB)/libpng-config 164 -@$(RM_F) $(DB)/libpng-config
165 -@$(RM_F) $(DB)/$(LIBNAME)-config 165 -@$(RM_F) $(DB)/$(LIBNAME)-config
166 cp libpng-config $(DB)/$(LIBNAME)-config 166 cp libpng-config $(DB)/$(LIBNAME)-config
167 chmod 755 $(DB)/$(LIBNAME)-config 167 chmod 755 $(DB)/$(LIBNAME)-config
168 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 168 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
169 169
170install: install-static install-shared install-man install-config 170install: install-static install-shared install-man install-config
171 171
172# If you installed in $(DESTDIR), test-installed won't work until you 172# If you installed in $(DESTDIR), test-installed won't work until you
173# move the library to its final location. Use test-dd to test it 173# move the library to its final location. Use test-dd to test it
174# before then. 174# before then.
175 175
176test-dd: 176test-dd:
177 echo 177 echo
178 echo Testing installed dynamic shared library in $(DL). 178 echo Testing installed dynamic shared library in $(DL).
179 $(CC) -I$(DI) $(CFLAGS) \ 179 $(CC) -I$(DI) $(CFLAGS) \
180 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 180 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
181 -L$(DL) -L$(ZLIBLIB) -Wl,-rpath $(ZLIBLIB):$(DL) \ 181 -L$(DL) -L$(ZLIBLIB) -Wl,-rpath $(ZLIBLIB):$(DL) \
182 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 182 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
183 ./pngtestd pngtest.png 183 ./pngtestd pngtest.png
184 184
185test-installed: 185test-installed:
186 $(CC) $(CFLAGS) \ 186 $(CC) $(CFLAGS) \
187 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 187 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
188 -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ 188 -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
189 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 189 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
190 ./pngtesti pngtest.png 190 ./pngtesti pngtest.png
191 191
192clean: 192clean:
193 $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ 193 $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
194 $(LIBSO) $(LIBSOMAJ)* pngtesti \ 194 $(LIBSO) $(LIBSOMAJ)* pngtesti \
195 pnglibconf.h libpng.pc 195 pnglibconf.h libpng.pc
196 196
197# DO NOT DELETE THIS LINE -- make depend depends on it. 197# DO NOT DELETE THIS LINE -- make depend depends on it.
198 198
199png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 199png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
200pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 200pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
201pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 201pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
202pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 202pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
203pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 203pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
204pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 204pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
205pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 205pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
206pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 206pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
207pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 207pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
208pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 208pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
209pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 209pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
210pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 210pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
211pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 211pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
212pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 212pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
213pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 213pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
214 214
215pngtest.o: png.h pngconf.h pnglibconf.h 215pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bor b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bor
index 8251503..96d5e86 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bor
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.bor
@@ -1,161 +1,161 @@
1# Makefile for libpng 1# Makefile for libpng
2# 16-bit Borland C++ (Note: All modules are compiled in C mode) 2# 16-bit Borland C++ (Note: All modules are compiled in C mode)
3# To build the library, do: 3# To build the library, do:
4# "make -fmakefile.bor -DMODEL=c" 4# "make -fmakefile.bor -DMODEL=c"
5# or: "make -fmakefile.bor -DMODEL=l" 5# or: "make -fmakefile.bor -DMODEL=l"
6# 6#
7# ------------ Borland C++ ------------ 7# ------------ Borland C++ ------------
8 8
9### Absolutely necessary for this makefile to work 9### Absolutely necessary for this makefile to work
10.AUTODEPEND 10.AUTODEPEND
11 11
12## Where zlib.h, zconf.h and zlib_MODEL.lib are 12## Where zlib.h, zconf.h and zlib_MODEL.lib are
13ZLIB_DIR=..\zlib 13ZLIB_DIR=..\zlib
14 14
15## Compiler, linker and lib stuff 15## Compiler, linker and lib stuff
16CC=bcc 16CC=bcc
17LD=bcc 17LD=bcc
18LIB=tlib 18LIB=tlib
19 19
20!ifndef MODEL 20!ifndef MODEL
21MODEL=l 21MODEL=l
22!endif 22!endif
23 23
24MODEL_ARG=-m$(MODEL) 24MODEL_ARG=-m$(MODEL)
25 25
26#TARGET_CPU=3 26#TARGET_CPU=3
27# 2 = 286, 3 = 386, etc. 27# 2 = 286, 3 = 386, etc.
28!ifndef TARGET_CPU 28!ifndef TARGET_CPU
29TARGET_CPU=2 29TARGET_CPU=2
30!endif 30!endif
31 31
32# Use this if you don't want Borland's fancy exception handling 32# Use this if you don't want Borland's fancy exception handling
33# (for Borland C++ 4.0 or later) 33# (for Borland C++ 4.0 or later)
34#NOEHLIB=noeh$(MODEL).lib 34#NOEHLIB=noeh$(MODEL).lib
35 35
36!ifdef DEBUG 36!ifdef DEBUG
37CDEBUG=-v 37CDEBUG=-v
38LDEBUG=-v 38LDEBUG=-v
39!else 39!else
40CDEBUG= 40CDEBUG=
41LDEBUG= 41LDEBUG=
42!endif 42!endif
43 43
44# STACKOFLOW=1 44# STACKOFLOW=1
45!ifdef STACKOFLOW 45!ifdef STACKOFLOW
46CDEBUG=$(CDEBUG) -N 46CDEBUG=$(CDEBUG) -N
47LDEBUG=$(LDEBUG) -N 47LDEBUG=$(LDEBUG) -N
48!endif 48!endif
49 49
50# -X- turn on dependency generation in the object file 50# -X- turn on dependency generation in the object file
51# -w set all warnings on 51# -w set all warnings on
52# -O2 optimize for speed 52# -O2 optimize for speed
53# -Z global optimization 53# -Z global optimization
54CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) 54CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG)
55 55
56# -M generate map file 56# -M generate map file
57LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG) 57LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG)
58 58
59## Variables 59## Variables
60 60
61OBJS = \ 61OBJS = \
62 png.obj \ 62 png.obj \
63 pngerror.obj \ 63 pngerror.obj \
64 pngget.obj \ 64 pngget.obj \
65 pngmem.obj \ 65 pngmem.obj \
66 pngpread.obj \ 66 pngpread.obj \
67 pngread.obj \ 67 pngread.obj \
68 pngrio.obj \ 68 pngrio.obj \
69 pngrtran.obj \ 69 pngrtran.obj \
70 pngrutil.obj \ 70 pngrutil.obj \
71 pngset.obj \ 71 pngset.obj \
72 pngtrans.obj \ 72 pngtrans.obj \
73 pngwio.obj \ 73 pngwio.obj \
74 pngwrite.obj \ 74 pngwrite.obj \
75 pngwtran.obj \ 75 pngwtran.obj \
76 pngwutil.obj 76 pngwutil.obj
77 77
78LIBOBJS = \ 78LIBOBJS = \
79 +png.obj \ 79 +png.obj \
80 +pngerror.obj \ 80 +pngerror.obj \
81 +pngget.obj \ 81 +pngget.obj \
82 +pngmem.obj \ 82 +pngmem.obj \
83 +pngpread.obj \ 83 +pngpread.obj \
84 +pngread.obj \ 84 +pngread.obj \
85 +pngrio.obj \ 85 +pngrio.obj \
86 +pngrtran.obj \ 86 +pngrtran.obj \
87 +pngrutil.obj \ 87 +pngrutil.obj \
88 +pngset.obj \ 88 +pngset.obj \
89 +pngtrans.obj \ 89 +pngtrans.obj \
90 +pngwio.obj \ 90 +pngwio.obj \
91 +pngwrite.obj \ 91 +pngwrite.obj \
92 +pngwtran.obj \ 92 +pngwtran.obj \
93 +pngwutil.obj 93 +pngwutil.obj
94 94
95LIBNAME=libpng$(MODEL).lib 95LIBNAME=libpng$(MODEL).lib
96 96
97## Implicit rules 97## Implicit rules
98 98
99# Braces let make "batch" calls to the compiler, 99# Braces let make "batch" calls to the compiler,
100# 2 calls instead of 12; space is important. 100# 2 calls instead of 12; space is important.
101.c.obj: 101.c.obj:
102 $(CC) $(CFLAGS) -c {$*.c } 102 $(CC) $(CFLAGS) -c {$*.c }
103 103
104.c.exe: 104.c.exe:
105 $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB) 105 $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
106 106
107## Major targets 107## Major targets
108 108
109all: libpng pngtest 109all: libpng pngtest
110 110
111# try !inlude scripts\pnglibconf.mak for more options 111# try !inlude scripts\pnglibconf.mak for more options
112pnglibconf.h: scripts\pnglibconf.h.prebuilt 112pnglibconf.h: scripts\pnglibconf.h.prebuilt
113 copy scripts\pnglibconf.h.prebuilt $@ 113 copy scripts\pnglibconf.h.prebuilt $@
114 114
115libpng: $(LIBNAME) 115libpng: $(LIBNAME)
116 116
117pngtest: pngtest$(MODEL).exe 117pngtest: pngtest$(MODEL).exe
118 118
119test: pngtest$(MODEL).exe 119test: pngtest$(MODEL).exe
120 pngtest$(MODEL) 120 pngtest$(MODEL)
121 121
122## Minor Targets 122## Minor Targets
123 123
124png.obj: png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 124png.obj: png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
125pngerror.obj: pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 125pngerror.obj: pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
126pngget.obj: pngget.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 126pngget.obj: pngget.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
127pngmem.obj: pngmem.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 127pngmem.obj: pngmem.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
128pngpread.obj: pngpread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 128pngpread.obj: pngpread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
129pngread.obj: pngread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 129pngread.obj: pngread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
130pngrio.obj: pngrio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 130pngrio.obj: pngrio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
131pngrtran.obj: pngrtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 131pngrtran.obj: pngrtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
132pngrutil.obj: pngrutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 132pngrutil.obj: pngrutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
133pngset.obj: pngset.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 133pngset.obj: pngset.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
134pngtrans.obj: pngtrans.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 134pngtrans.obj: pngtrans.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
135pngwio.obj: pngwio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 135pngwio.obj: pngwio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
136pngwrite.obj: pngwrite.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 136pngwrite.obj: pngwrite.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
137pngwtran.obj: pngwtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 137pngwtran.obj: pngwtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
138pngwutil.obj: pngwutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 138pngwutil.obj: pngwutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
139 139
140$(LIBNAME): $(OBJS) 140$(LIBNAME): $(OBJS)
141 -del $(LIBNAME) 141 -del $(LIBNAME)
142 $(LIB) $(LIBNAME) @&&| 142 $(LIB) $(LIBNAME) @&&|
143$(LIBOBJS), libpng$(MODEL) 143$(LIBOBJS), libpng$(MODEL)
144| 144|
145 145
146pngtest$(MODEL).obj: pngtest.c png.h pngconf.h pnglibconf.h 146pngtest$(MODEL).obj: pngtest.c png.h pngconf.h pnglibconf.h
147 $(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c 147 $(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c
148 148
149pngtest$(MODEL).exe: pngtest$(MODEL).obj 149pngtest$(MODEL).exe: pngtest$(MODEL).obj
150 $(LD) $(LDFLAGS) pngtest$(MODEL).obj $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB) 150 $(LD) $(LDFLAGS) pngtest$(MODEL).obj $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
151 151
152# Clean up anything else you want 152# Clean up anything else you want
153clean: 153clean:
154 -del pnglibconf.h 154 -del pnglibconf.h
155 -del *.obj 155 -del *.obj
156 -del *.exe 156 -del *.exe
157 -del *.lib 157 -del *.lib
158 -del *.lst 158 -del *.lst
159 -del *.map 159 -del *.map
160 160
161# End of makefile for libpng 161# End of makefile for libpng
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.cegcc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.cegcc
index 6d4f6ef..971cd01 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.cegcc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.cegcc
@@ -1,116 +1,116 @@
1# Makefile for creating Windows CE release archives, with the 1# Makefile for creating Windows CE release archives, with the
2# mingw32ce compiler. 2# mingw32ce compiler.
3 3
4# Last updated: 22-Jul-2008 4# Last updated: 22-Jul-2008
5 5
6# Copyright (C) 2008 Vincent Torri 6# Copyright (C) 2008 Vincent Torri
7 7
8# This code is released under the libpng license. 8# This code is released under the libpng license.
9# For conditions of distribution and use, see the disclaimer 9# For conditions of distribution and use, see the disclaimer
10# and license in png.h 10# and license in png.h
11 11
12# To get some help, type 12# To get some help, type
13# 13#
14# make help 14# make help
15# 15#
16# To create the archives 16# To create the archives
17# 17#
18# make 18# make
19# 19#
20# To remove everything, type: 20# To remove everything, type:
21# 21#
22# make clean 22# make clean
23 23
24VERMAJ = 1 24VERMAJ = 1
25VERMIN = 5 25VERMIN = 5
26VERMIC = 9 26VERMIC = 9
27VER = $(VERMAJ).$(VERMIN).$(VERMIC) 27VER = $(VERMAJ).$(VERMIN).$(VERMIC)
28NAME = libpng 28NAME = libpng
29PACKAGE = $(NAME)-$(VER) 29PACKAGE = $(NAME)-$(VER)
30 30
31BIN = libpng15-0.dll 31BIN = libpng15-0.dll
32LIB = libpng15.a libpng15.dll.a libpng.a libpng.dll.a 32LIB = libpng15.a libpng15.dll.a libpng.a libpng.dll.a
33INCLUDE = png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 33INCLUDE = png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
34PC = libpng15.pc libpng.pc 34PC = libpng15.pc libpng.pc
35 35
36MANIFESTVERBIN = "Libpng-$(VER): Binary files" 36MANIFESTVERBIN = "Libpng-$(VER): Binary files"
37MANIFESTVERDEV = "Libpng-$(VER): Developer files" 37MANIFESTVERDEV = "Libpng-$(VER): Developer files"
38MANIFESTVERDESC = "Libpng: the official PNG reference library" 38MANIFESTVERDESC = "Libpng: the official PNG reference library"
39 39
40all: $(NAME) 40all: $(NAME)
41 41
42$(NAME): remove-old copy-src compilation copy manifest archive 42$(NAME): remove-old copy-src compilation copy manifest archive
43 @echo " * Removal of the directories" 43 @echo " * Removal of the directories"
44 @rm -rf $(PACKAGE)/ $(PACKAGE)-bin/ $(PACKAGE)-dev/ 44 @rm -rf $(PACKAGE)/ $(PACKAGE)-bin/ $(PACKAGE)-dev/
45 45
46remove-old: 46remove-old:
47 @echo " * Removal of the old files" 47 @echo " * Removal of the old files"
48 @rm -rf $(PACKAGE)-bin* 48 @rm -rf $(PACKAGE)-bin*
49 @rm -rf $(PACKAGE)-dev* 49 @rm -rf $(PACKAGE)-dev*
50 50
51copy-src: 51copy-src:
52 @echo " * Copy of source files" 52 @echo " * Copy of source files"
53 @cp -R ../src/$(PACKAGE) . 53 @cp -R ../src/$(PACKAGE) .
54 @echo " * Creation of directories and files" 54 @echo " * Creation of directories and files"
55 @mkdir -p $(PACKAGE)-bin/bin 55 @mkdir -p $(PACKAGE)-bin/bin
56 @mkdir -p $(PACKAGE)-bin/manifest 56 @mkdir -p $(PACKAGE)-bin/manifest
57 @mkdir -p $(PACKAGE)-dev/lib/pkgconfig 57 @mkdir -p $(PACKAGE)-dev/lib/pkgconfig
58 @mkdir -p $(PACKAGE)-dev/include/$(NAME)$(VERMAJ)$(VERMIN) 58 @mkdir -p $(PACKAGE)-dev/include/$(NAME)$(VERMAJ)$(VERMIN)
59 @mkdir -p $(PACKAGE)-dev/manifest 59 @mkdir -p $(PACKAGE)-dev/manifest
60 @touch $(PACKAGE)-bin/manifest/$(PACKAGE)-bin.mft 60 @touch $(PACKAGE)-bin/manifest/$(PACKAGE)-bin.mft
61 @touch $(PACKAGE)-bin/manifest/$(PACKAGE)-bin.ver 61 @touch $(PACKAGE)-bin/manifest/$(PACKAGE)-bin.ver
62 @touch $(PACKAGE)-dev/manifest/$(PACKAGE)-dev.mft 62 @touch $(PACKAGE)-dev/manifest/$(PACKAGE)-dev.mft
63 @touch $(PACKAGE)-dev/manifest/$(PACKAGE)-dev.ver 63 @touch $(PACKAGE)-dev/manifest/$(PACKAGE)-dev.ver
64 64
65compilation: 65compilation:
66 @echo " * Compilation of $(PACKAGE)" 66 @echo " * Compilation of $(PACKAGE)"
67 cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_CONSOLE_IO_SUPPORTED -D_WIN32_WCE=0x0420" \ 67 cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_CONSOLE_IO_SUPPORTED -D_WIN32_WCE=0x0420" \
68 CFLAGS="$(CFLAGS) -mms-bitfields -O3 -pipe -fomit-frame-pointer" \ 68 CFLAGS="$(CFLAGS) -mms-bitfields -O3 -pipe -fomit-frame-pointer" \
69 LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" \ 69 LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" \
70 ./configure --prefix=/opt/wince --host=arm-mingw32ce && make 70 ./configure --prefix=/opt/wince --host=arm-mingw32ce && make
71 71
72copy: 72copy:
73 @echo " * Copy of binary and development files" 73 @echo " * Copy of binary and development files"
74 @for i in $(BIN); do \ 74 @for i in $(BIN); do \
75 cp $(PACKAGE)/.libs/$$i $(PACKAGE)-bin/bin; \ 75 cp $(PACKAGE)/.libs/$$i $(PACKAGE)-bin/bin; \
76 done 76 done
77 @for i in $(LIB); do \ 77 @for i in $(LIB); do \
78 cp $(PACKAGE)/.libs/$$i $(PACKAGE)-dev/lib; \ 78 cp $(PACKAGE)/.libs/$$i $(PACKAGE)-dev/lib; \
79 done 79 done
80 @for i in $(INCLUDE); do \ 80 @for i in $(INCLUDE); do \
81 cp $(PACKAGE)/$$i $(PACKAGE)-dev/include/$(NAME)$(VERMAJ)$(VERMIN); \ 81 cp $(PACKAGE)/$$i $(PACKAGE)-dev/include/$(NAME)$(VERMAJ)$(VERMIN); \
82 done 82 done
83 @for i in $(PC); do \ 83 @for i in $(PC); do \
84 cp $(PACKAGE)/$$i $(PACKAGE)-dev/lib/pkgconfig; \ 84 cp $(PACKAGE)/$$i $(PACKAGE)-dev/lib/pkgconfig; \
85 done 85 done
86 86
87manifest: 87manifest:
88 @echo " * Creation of the manifest" 88 @echo " * Creation of the manifest"
89 @cd $(PACKAGE)-bin && find * >> manifest/$(PACKAGE)-bin.mft 89 @cd $(PACKAGE)-bin && find * >> manifest/$(PACKAGE)-bin.mft
90 @cd $(PACKAGE)-bin && \ 90 @cd $(PACKAGE)-bin && \
91 echo $(MANIFESTVERBIN) >> manifest/$(PACKAGE)-bin.ver && \ 91 echo $(MANIFESTVERBIN) >> manifest/$(PACKAGE)-bin.ver && \
92 echo $(MANIFESTVERDESC) >> manifest/$(PACKAGE)-bin.ver 92 echo $(MANIFESTVERDESC) >> manifest/$(PACKAGE)-bin.ver
93 @cd $(PACKAGE)-dev && find * >> manifest/$(PACKAGE)-dev.mft 93 @cd $(PACKAGE)-dev && find * >> manifest/$(PACKAGE)-dev.mft
94 @cd $(PACKAGE)-dev && \ 94 @cd $(PACKAGE)-dev && \
95 echo $(MANIFESTVERDEV) >> manifest/$(PACKAGE)-dev.ver && \ 95 echo $(MANIFESTVERDEV) >> manifest/$(PACKAGE)-dev.ver && \
96 echo $(MANIFESTVERDESC) >> manifest/$(PACKAGE)-dev.ver 96 echo $(MANIFESTVERDESC) >> manifest/$(PACKAGE)-dev.ver
97 97
98archive: 98archive:
99 @echo " * Creation of the archives" 99 @echo " * Creation of the archives"
100 @tar cf $(PACKAGE)-bin.tar $(PACKAGE)-bin 100 @tar cf $(PACKAGE)-bin.tar $(PACKAGE)-bin
101 @bzip2 -9 $(PACKAGE)-bin.tar 101 @bzip2 -9 $(PACKAGE)-bin.tar
102 @tar cf $(PACKAGE)-dev.tar $(PACKAGE)-dev 102 @tar cf $(PACKAGE)-dev.tar $(PACKAGE)-dev
103 @bzip2 -9 $(PACKAGE)-dev.tar 103 @bzip2 -9 $(PACKAGE)-dev.tar
104 104
105clean: 105clean:
106 @echo " * Cleaning" 106 @echo " * Cleaning"
107 @rm -rf $(PACKAGE)* 107 @rm -rf $(PACKAGE)*
108 108
109help: 109help:
110 @echo 110 @echo
111 @echo "To create the archives, type:" 111 @echo "To create the archives, type:"
112 @echo " make" 112 @echo " make"
113 @echo 113 @echo
114 @echo "To remove everything, type:" 114 @echo "To remove everything, type:"
115 @echo " make clean" 115 @echo " make clean"
116 @echo 116 @echo
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.darwin b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.darwin
index bb62b09..337a815 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.darwin
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.darwin
@@ -1,220 +1,220 @@
1# makefile for libpng on Darwin / Mac OS X 1# makefile for libpng on Darwin / Mac OS X
2# Copyright (C) 2002, 2004, 2006, 2008, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 2002, 2004, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
3# Copyright (C) 2001 Christoph Pfisterer 3# Copyright (C) 2001 Christoph Pfisterer
4# derived from makefile.linux: 4# derived from makefile.linux:
5# Copyright (C) 1998, 1999 Greg Roelofs 5# Copyright (C) 1998, 1999 Greg Roelofs
6# Copyright (C) 1996, 1997 Andreas Dilger 6# Copyright (C) 1996, 1997 Andreas Dilger
7# 7#
8# This code is released under the libpng license. 8# This code is released under the libpng license.
9# For conditions of distribution and use, see the disclaimer 9# For conditions of distribution and use, see the disclaimer
10# and license in png.h 10# and license in png.h
11 11
12# where "make install" puts libpng.a, libpng15.dylib, png.h, pngconf.h, 12# where "make install" puts libpng.a, libpng15.dylib, png.h, pngconf.h,
13# and pnglibconf.h 13# and pnglibconf.h
14prefix=/usr/local 14prefix=/usr/local
15exec_prefix=$(prefix) 15exec_prefix=$(prefix)
16 16
17# Where the zlib library and include files are located 17# Where the zlib library and include files are located
18#ZLIBLIB=/usr/local/lib 18#ZLIBLIB=/usr/local/lib
19#ZLIBINC=/usr/local/include 19#ZLIBINC=/usr/local/include
20ZLIBLIB=../zlib 20ZLIBLIB=../zlib
21ZLIBINC=../zlib 21ZLIBINC=../zlib
22 22
23# Library name: 23# Library name:
24LIBNAME = libpng15 24LIBNAME = libpng15
25PNGMAJ = 15 25PNGMAJ = 15
26 26
27# Shared library names: 27# Shared library names:
28LIBSO=$(LIBNAME).dylib 28LIBSO=$(LIBNAME).dylib
29LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib 29LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib
30LIBSOREL=$(LIBNAME).$(PNGMAJ).$(RELEASE).dylib 30LIBSOREL=$(LIBNAME).$(PNGMAJ).$(RELEASE).dylib
31OLDSO=libpng.dylib 31OLDSO=libpng.dylib
32 32
33# Utilities: 33# Utilities:
34CC=cc 34CC=cc
35AR_RC=ar rc 35AR_RC=ar rc
36MKDIR_P=mkdir -p 36MKDIR_P=mkdir -p
37LN_SF=ln -sf 37LN_SF=ln -sf
38RANLIB=ranlib 38RANLIB=ranlib
39RM_F=/bin/rm -f 39RM_F=/bin/rm -f
40ARCH="-arch i386 -arch x86_64" 40ARCH="-arch i386 -arch x86_64"
41 41
42# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops 42# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops
43CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops $(ARCH) 43CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops $(ARCH)
44LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz $(ARCH) 44LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz $(ARCH)
45 45
46INCPATH=$(prefix)/include 46INCPATH=$(prefix)/include
47LIBPATH=$(exec_prefix)/lib 47LIBPATH=$(exec_prefix)/lib
48MANPATH=$(prefix)/man 48MANPATH=$(prefix)/man
49BINPATH=$(exec_prefix)/bin 49BINPATH=$(exec_prefix)/bin
50 50
51# override DESTDIR= on the make install command line to easily support 51# override DESTDIR= on the make install command line to easily support
52# installing into a temporary location. Example: 52# installing into a temporary location. Example:
53# 53#
54# make install DESTDIR=/tmp/build/libpng 54# make install DESTDIR=/tmp/build/libpng
55# 55#
56# If you're going to install into a temporary location 56# If you're going to install into a temporary location
57# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 57# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
58# you execute make install. 58# you execute make install.
59DESTDIR= 59DESTDIR=
60 60
61DB=$(DESTDIR)$(BINPATH) 61DB=$(DESTDIR)$(BINPATH)
62DI=$(DESTDIR)$(INCPATH) 62DI=$(DESTDIR)$(INCPATH)
63DL=$(DESTDIR)$(LIBPATH) 63DL=$(DESTDIR)$(LIBPATH)
64DM=$(DESTDIR)$(MANPATH) 64DM=$(DESTDIR)$(MANPATH)
65 65
66OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 66OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
67 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 67 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
68 pngwtran.o pngmem.o pngerror.o pngpread.o 68 pngwtran.o pngmem.o pngerror.o pngpread.o
69 69
70OBJSDLL = $(OBJS:.o=.pic.o) 70OBJSDLL = $(OBJS:.o=.pic.o)
71 71
72.SUFFIXES: .c .o .pic.o 72.SUFFIXES: .c .o .pic.o
73 73
74.c.pic.o: 74.c.pic.o:
75 $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c 75 $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
76 76
77all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 77all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
78 78
79# see scripts/pnglibconf.mak for more options 79# see scripts/pnglibconf.mak for more options
80pnglibconf.h: scripts/pnglibconf.h.prebuilt 80pnglibconf.h: scripts/pnglibconf.h.prebuilt
81 cp scripts/pnglibconf.h.prebuilt $@ 81 cp scripts/pnglibconf.h.prebuilt $@
82 82
83libpng.a: $(OBJS) 83libpng.a: $(OBJS)
84 $(AR_RC) $@ $(OBJS) 84 $(AR_RC) $@ $(OBJS)
85 $(RANLIB) $@ 85 $(RANLIB) $@
86 86
87libpng.pc: 87libpng.pc:
88 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 88 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
89 -e s!@exec_prefix@!$(exec_prefix)! \ 89 -e s!@exec_prefix@!$(exec_prefix)! \
90 -e s!@libdir@!$(LIBPATH)! \ 90 -e s!@libdir@!$(LIBPATH)! \
91 -e s!@includedir@!$(INCPATH)! \ 91 -e s!@includedir@!$(INCPATH)! \
92 -e s!-lpng15!-lpng15\ -lz! > libpng.pc 92 -e s!-lpng15!-lpng15\ -lz! > libpng.pc
93 93
94libpng-config: 94libpng-config:
95 ( cat scripts/libpng-config-head.in; \ 95 ( cat scripts/libpng-config-head.in; \
96 echo prefix=\"$(prefix)\"; \ 96 echo prefix=\"$(prefix)\"; \
97 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 97 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
98 echo L_opts=\"-L$(LIBPATH)\"; \ 98 echo L_opts=\"-L$(LIBPATH)\"; \
99 echo libs=\"-lpng15 -lz\"; \ 99 echo libs=\"-lpng15 -lz\"; \
100 cat scripts/libpng-config-body.in ) > libpng-config 100 cat scripts/libpng-config-body.in ) > libpng-config
101 chmod +x libpng-config 101 chmod +x libpng-config
102 102
103$(LIBSO): $(LIBSOMAJ) 103$(LIBSO): $(LIBSOMAJ)
104 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 104 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
105 105
106$(LIBSOMAJ): $(OBJSDLL) 106$(LIBSOMAJ): $(OBJSDLL)
107 $(CC) -dynamiclib \ 107 $(CC) -dynamiclib \
108 -install_name $(LIBPATH)/$(LIBSOMAJ) \ 108 -install_name $(LIBPATH)/$(LIBSOMAJ) \
109 -current_version 15 -compatibility_version 15 \ 109 -current_version 15 -compatibility_version 15 \
110 -o $(LIBSOMAJ) \ 110 -o $(LIBSOMAJ) \
111 $(OBJSDLL) -L$(ZLIBLIB) -lz 111 $(OBJSDLL) -L$(ZLIBLIB) -lz
112 112
113pngtest: pngtest.o $(LIBSO) 113pngtest: pngtest.o $(LIBSO)
114 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 114 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
115 115
116test: pngtest 116test: pngtest
117 ./pngtest 117 ./pngtest
118 118
119install-headers: png.h pngconf.h pnglibconf.h 119install-headers: png.h pngconf.h pnglibconf.h
120 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 120 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
121 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 121 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
122 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 122 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
123 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 123 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
124 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 124 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
125 -@$(RM_F) $(DI)/libpng 125 -@$(RM_F) $(DI)/libpng
126 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 126 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
127 127
128install-static: install-headers libpng.a 128install-static: install-headers libpng.a
129 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 129 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
130 cp libpng.a $(DL)/$(LIBNAME).a 130 cp libpng.a $(DL)/$(LIBNAME).a
131 chmod 644 $(DL)/$(LIBNAME).a 131 chmod 644 $(DL)/$(LIBNAME).a
132 $(RANLIB) $(DL)/$(LIBNAME).a 132 $(RANLIB) $(DL)/$(LIBNAME).a
133 -@$(RM_F) $(DL)/libpng.a 133 -@$(RM_F) $(DL)/libpng.a
134 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 134 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
135 135
136install-shared: install-headers $(LIBSOMAJ) libpng.pc 136install-shared: install-headers $(LIBSOMAJ) libpng.pc
137 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 137 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
138 -@$(RM_F) $(DL)/$(LIBSO) 138 -@$(RM_F) $(DL)/$(LIBSO)
139 -@$(RM_F) $(DL)/$(LIBSOREL) 139 -@$(RM_F) $(DL)/$(LIBSOREL)
140 -@$(RM_F) $(DL)/$(OLDSO) 140 -@$(RM_F) $(DL)/$(OLDSO)
141 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 141 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
142 chmod 755 $(DL)/$(LIBSOREL) 142 chmod 755 $(DL)/$(LIBSOREL)
143 (cd $(DL); \ 143 (cd $(DL); \
144 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 144 $(LN_SF) $(LIBSOREL) $(LIBSO); \
145 $(LN_SF) $(LIBSO) $(OLDSO)) 145 $(LN_SF) $(LIBSO) $(OLDSO))
146 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 146 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
147 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 147 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
148 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 148 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
149 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 149 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
150 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 150 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
151 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 151 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
152 152
153install-man: libpng.3 libpngpf.3 png.5 153install-man: libpng.3 libpngpf.3 png.5
154 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 154 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
155 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 155 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
156 -@$(RM_F) $(DM)/man3/libpng.3 156 -@$(RM_F) $(DM)/man3/libpng.3
157 -@$(RM_F) $(DM)/man3/libpngpf.3 157 -@$(RM_F) $(DM)/man3/libpngpf.3
158 cp libpng.3 $(DM)/man3 158 cp libpng.3 $(DM)/man3
159 cp libpngpf.3 $(DM)/man3 159 cp libpngpf.3 $(DM)/man3
160 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 160 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
161 -@$(RM_F) $(DM)/man5/png.5 161 -@$(RM_F) $(DM)/man5/png.5
162 cp png.5 $(DM)/man5 162 cp png.5 $(DM)/man5
163 163
164install-config: libpng-config 164install-config: libpng-config
165 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 165 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
166 -@$(RM_F) $(DB)/libpng-config 166 -@$(RM_F) $(DB)/libpng-config
167 -@$(RM_F) $(DB)/$(LIBNAME)-config 167 -@$(RM_F) $(DB)/$(LIBNAME)-config
168 cp libpng-config $(DB)/$(LIBNAME)-config 168 cp libpng-config $(DB)/$(LIBNAME)-config
169 chmod 755 $(DB)/$(LIBNAME)-config 169 chmod 755 $(DB)/$(LIBNAME)-config
170 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 170 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
171 171
172install: install-static install-shared install-man install-config 172install: install-static install-shared install-man install-config
173 173
174# If you installed in $(DESTDIR), test-installed won't work until you 174# If you installed in $(DESTDIR), test-installed won't work until you
175# move the library to its final location. Use test-dd to test it 175# move the library to its final location. Use test-dd to test it
176# before then. 176# before then.
177 177
178test-dd: 178test-dd:
179 echo 179 echo
180 echo Testing installed dynamic shared library in $(DL). 180 echo Testing installed dynamic shared library in $(DL).
181 $(CC) -I$(DI) -I$(ZLIBINC) \ 181 $(CC) -I$(DI) -I$(ZLIBINC) \
182 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 182 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
183 -L$(DL) -L$(ZLIBLIB) \ 183 -L$(DL) -L$(ZLIBLIB) \
184 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 184 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
185 ./pngtestd pngtest.png 185 ./pngtestd pngtest.png
186 186
187test-installed: 187test-installed:
188 $(CC) $(CFLAGS) \ 188 $(CC) $(CFLAGS) \
189 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 189 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
190 -L$(ZLIBLIB) \ 190 -L$(ZLIBLIB) \
191 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 191 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
192 ./pngtesti pngtest.png 192 ./pngtesti pngtest.png
193 193
194clean: 194clean:
195 $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ 195 $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
196 libpng.pc $(LIBNAME).*dylib pngtesti pnglibconf.h 196 libpng.pc $(LIBNAME).*dylib pngtesti pnglibconf.h
197 197
198DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 198DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
199writelock: 199writelock:
200 chmod a-w *.[ch35] $(DOCS) scripts/* 200 chmod a-w *.[ch35] $(DOCS) scripts/*
201 201
202# DO NOT DELETE THIS LINE -- make depend depends on it. 202# DO NOT DELETE THIS LINE -- make depend depends on it.
203 203
204png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 204png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
205pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 205pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
206pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 206pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
207pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 207pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
208pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 208pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
209pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 209pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
210pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 210pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
211pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 211pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
212pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 212pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
213pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 213pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
214pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 214pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
215pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 215pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
216pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 216pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
217pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 217pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
218pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 218pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
219 219
220pngtest.o: png.h pngconf.h pnglibconf.h 220pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dec b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dec
index 5687ca1..5301d87 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dec
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dec
@@ -1,202 +1,202 @@
1# makefile for libpng on DEC Alpha Unix 1# makefile for libpng on DEC Alpha Unix
2# Copyright (C) 2000-2002, 2006, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 2000-2002, 2006, 2010-2011 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# Library name: 9# Library name:
10PNGMAJ = 15 10PNGMAJ = 15
11LIBNAME = libpng15 11LIBNAME = libpng15
12 12
13# Shared library names: 13# Shared library names:
14LIBSO=$(LIBNAME).so 14LIBSO=$(LIBNAME).so
15LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 15LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
16LIBSOREL=$(LIBSOMAJ).$(RELEASE) 16LIBSOREL=$(LIBSOMAJ).$(RELEASE)
17OLDSO=libpng.so 17OLDSO=libpng.so
18 18
19# Utilities: 19# Utilities:
20AR_RC=ar rc 20AR_RC=ar rc
21CC=cc 21CC=cc
22MKDIR_P=mkdir 22MKDIR_P=mkdir
23LN_SF=ln -f -s 23LN_SF=ln -f -s
24RANLIB=ranlib 24RANLIB=ranlib
25RM_F=/bin/rm -f 25RM_F=/bin/rm -f
26 26
27# where make install puts libpng.a and png.h 27# where make install puts libpng.a and png.h
28prefix=/usr/local 28prefix=/usr/local
29exec_prefix=$(prefix) 29exec_prefix=$(prefix)
30INCPATH=$(prefix)/include 30INCPATH=$(prefix)/include
31LIBPATH=$(exec_prefix)/lib 31LIBPATH=$(exec_prefix)/lib
32MANPATH=$(prefix)/man 32MANPATH=$(prefix)/man
33BINPATH=$(exec_prefix)/bin 33BINPATH=$(exec_prefix)/bin
34 34
35# override DESTDIR= on the make install command line to easily support 35# override DESTDIR= on the make install command line to easily support
36# installing into a temporary location. Example: 36# installing into a temporary location. Example:
37# 37#
38# make install DESTDIR=/tmp/build/libpng 38# make install DESTDIR=/tmp/build/libpng
39# 39#
40# If you're going to install into a temporary location 40# If you're going to install into a temporary location
41# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 41# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
42# you execute make install. 42# you execute make install.
43DESTDIR= 43DESTDIR=
44 44
45DB=$(DESTDIR)$(BINPATH) 45DB=$(DESTDIR)$(BINPATH)
46DI=$(DESTDIR)$(INCPATH) 46DI=$(DESTDIR)$(INCPATH)
47DL=$(DESTDIR)$(LIBPATH) 47DL=$(DESTDIR)$(LIBPATH)
48DM=$(DESTDIR)$(MANPATH) 48DM=$(DESTDIR)$(MANPATH)
49 49
50# Where the zlib library and include files are located 50# Where the zlib library and include files are located
51#ZLIBLIB=/usr/local/lib 51#ZLIBLIB=/usr/local/lib
52#ZLIBINC=/usr/local/include 52#ZLIBINC=/usr/local/include
53ZLIBLIB=../zlib 53ZLIBLIB=../zlib
54ZLIBINC=../zlib 54ZLIBINC=../zlib
55 55
56CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 56CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
57LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm 57LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm
58 58
59OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 59OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
60 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 60 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
61 pngwtran.o pngmem.o pngerror.o pngpread.o 61 pngwtran.o pngmem.o pngerror.o pngpread.o
62 62
63all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config 63all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config
64 64
65# see scripts/pnglibconf.mak for more options 65# see scripts/pnglibconf.mak for more options
66pnglibconf.h: scripts/pnglibconf.h.prebuilt 66pnglibconf.h: scripts/pnglibconf.h.prebuilt
67 cp scripts/pnglibconf.h.prebuilt $@ 67 cp scripts/pnglibconf.h.prebuilt $@
68 68
69libpng.a: $(OBJS) 69libpng.a: $(OBJS)
70 $(AR_RC) $@ $(OBJS) 70 $(AR_RC) $@ $(OBJS)
71 $(RANLIB) $@ 71 $(RANLIB) $@
72 72
73libpng.pc: 73libpng.pc:
74 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 74 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
75 -e s!@exec_prefix@!$(exec_prefix)! \ 75 -e s!@exec_prefix@!$(exec_prefix)! \
76 -e s!@libdir@!$(LIBPATH)! \ 76 -e s!@libdir@!$(LIBPATH)! \
77 -e s!@includedir@!$(INCPATH)! \ 77 -e s!@includedir@!$(INCPATH)! \
78 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 78 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
79 79
80libpng-config: 80libpng-config:
81 ( cat scripts/libpng-config-head.in; \ 81 ( cat scripts/libpng-config-head.in; \
82 echo prefix=\"$(prefix)\"; \ 82 echo prefix=\"$(prefix)\"; \
83 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 83 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
84 echo ccopts=\"-std\"; \ 84 echo ccopts=\"-std\"; \
85 echo L_opts=\"-L$(LIBPATH)\"; \ 85 echo L_opts=\"-L$(LIBPATH)\"; \
86 echo libs=\"-lpng15 -lz -lm\"; \ 86 echo libs=\"-lpng15 -lz -lm\"; \
87 cat scripts/libpng-config-body.in ) > libpng-config 87 cat scripts/libpng-config-body.in ) > libpng-config
88 chmod +x libpng-config 88 chmod +x libpng-config
89 89
90$(LIBSO): $(LIBSOMAJ) 90$(LIBSO): $(LIBSOMAJ)
91 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 91 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
92 92
93$(LIBSOMAJ): $(OBJS) 93$(LIBSOMAJ): $(OBJS)
94 $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \ 94 $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
95 -soname $(LIBSOMAJ) 95 -soname $(LIBSOMAJ)
96 96
97pngtest: pngtest.o libpng.a 97pngtest: pngtest.o libpng.a
98 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 98 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
99 99
100test: pngtest 100test: pngtest
101 ./pngtest 101 ./pngtest
102 102
103install-headers: png.h pngconf.h pnglibconf.h 103install-headers: png.h pngconf.h pnglibconf.h
104 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 104 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
105 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 105 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
106 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 106 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
107 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 107 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
108 -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 108 -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
109 -@/bin/rm -f $(DI)/libpng 109 -@/bin/rm -f $(DI)/libpng
110 (cd $(DI); $(LN_SF)(LIBNAME) libpng; $(LN_SF)(LIBNAME)/* .) 110 (cd $(DI); $(LN_SF)(LIBNAME) libpng; $(LN_SF)(LIBNAME)/* .)
111 111
112install-static: install-headers libpng.a 112install-static: install-headers libpng.a
113 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 113 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
114 cp libpng.a $(DL)/$(LIBNAME).a 114 cp libpng.a $(DL)/$(LIBNAME).a
115 chmod 644 $(DL)/$(LIBNAME).a 115 chmod 644 $(DL)/$(LIBNAME).a
116 -@/bin/rm -f $(DL)/libpng.a 116 -@/bin/rm -f $(DL)/libpng.a
117 (cd $(DL); $(LN_SF)(LIBNAME).a libpng.a) 117 (cd $(DL); $(LN_SF)(LIBNAME).a libpng.a)
118 118
119install-shared: install-headers $(LIBSOMAJ) libpng.pc 119install-shared: install-headers $(LIBSOMAJ) libpng.pc
120 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 120 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
121 -@$(RM_F) $(DL)/$(LIBSO) 121 -@$(RM_F) $(DL)/$(LIBSO)
122 -@$(RM_F) $(DL)/$(LIBSOREL) 122 -@$(RM_F) $(DL)/$(LIBSOREL)
123 -@$(RM_F) $(DL)/$(OLDSO) 123 -@$(RM_F) $(DL)/$(OLDSO)
124 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 124 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
125 chmod 755 $(DL)/$(LIBSOREL) 125 chmod 755 $(DL)/$(LIBSOREL)
126 (cd $(DL); \ 126 (cd $(DL); \
127 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 127 $(LN_SF) $(LIBSOREL) $(LIBSO); \
128 $(LN_SF) $(LIBSO) $(OLDSO)) 128 $(LN_SF) $(LIBSO) $(OLDSO))
129 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 129 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
130 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 130 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
131 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 131 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
132 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 132 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
133 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 133 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
134 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 134 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
135 135
136install-man: libpng.3 libpngpf.3 png.5 136install-man: libpng.3 libpngpf.3 png.5
137 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 137 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
138 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 138 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
139 -@/bin/rm -f $(DM)/man3/libpng.3 139 -@/bin/rm -f $(DM)/man3/libpng.3
140 -@/bin/rm -f $(DM)/man3/libpngpf.3 140 -@/bin/rm -f $(DM)/man3/libpngpf.3
141 cp libpng.3 $(DM)/man3 141 cp libpng.3 $(DM)/man3
142 cp libpngpf.3 $(DM)/man3 142 cp libpngpf.3 $(DM)/man3
143 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 143 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
144 -@/bin/rm -f $(DM)/man5/png.5 144 -@/bin/rm -f $(DM)/man5/png.5
145 cp png.5 $(DM)/man5 145 cp png.5 $(DM)/man5
146 146
147install-config: libpng-config 147install-config: libpng-config
148 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 148 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
149 -@/bin/rm -f $(DB)/libpng-config 149 -@/bin/rm -f $(DB)/libpng-config
150 -@/bin/rm -f $(DB)/$(LIBNAME)-config 150 -@/bin/rm -f $(DB)/$(LIBNAME)-config
151 cp libpng-config $(DB)/$(LIBNAME)-config 151 cp libpng-config $(DB)/$(LIBNAME)-config
152 chmod 755 $(DB)/$(LIBNAME)-config 152 chmod 755 $(DB)/$(LIBNAME)-config
153 (cd $(DB); $(LN_SF)(LIBNAME)-config libpng-config) 153 (cd $(DB); $(LN_SF)(LIBNAME)-config libpng-config)
154 154
155install: install-static install-shared install-man install-config 155install: install-static install-shared install-man install-config
156 156
157# If you installed in $(DESTDIR), test-installed won't work until you 157# If you installed in $(DESTDIR), test-installed won't work until you
158# move the library to its final location. Use test-dd to test it 158# move the library to its final location. Use test-dd to test it
159# before then. 159# before then.
160 160
161test-dd: 161test-dd:
162 echo 162 echo
163 echo Testing installed dynamic shared library in $(DL). 163 echo Testing installed dynamic shared library in $(DL).
164 $(CC) -w1 -I$(DI) -I$(ZLIBINC) \ 164 $(CC) -w1 -I$(DI) -I$(ZLIBINC) \
165 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 165 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
166 -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) \ 166 -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) \
167 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 167 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
168 ./pngtestd pngtest.png 168 ./pngtestd pngtest.png
169 169
170test-installed: 170test-installed:
171 echo 171 echo
172 echo Testing installed dynamic shared library. 172 echo Testing installed dynamic shared library.
173 $(CC) -w1 -I$(ZLIBINC) \ 173 $(CC) -w1 -I$(ZLIBINC) \
174 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 174 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
175 -L$(ZLIBLIB) -R$(ZLIBLIB) \ 175 -L$(ZLIBLIB) -R$(ZLIBLIB) \
176 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 176 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
177 ./pngtesti pngtest.png 177 ./pngtesti pngtest.png
178 178
179clean: 179clean:
180 /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ 180 /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
181 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 181 libpng-config $(LIBSO) $(LIBSOMAJ)* \
182 libpng.pc pnglibconf.h 182 libpng.pc pnglibconf.h
183 183
184# DO NOT DELETE THIS LINE -- make depend depends on it. 184# DO NOT DELETE THIS LINE -- make depend depends on it.
185 185
186png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 186png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
187pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 187pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
188pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 188pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
189pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 189pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
190pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 190pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
191pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 191pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
192pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 192pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
193pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 193pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
194pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 194pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
195pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 195pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
196pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 196pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
197pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 197pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
198pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 198pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
199pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 199pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
200pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 200pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
201 201
202pngtest.o: png.h pngconf.h pnglibconf.h 202pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dj2 b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dj2
index 48fea81..87a05a3 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dj2
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.dj2
@@ -1,62 +1,62 @@
1# DJGPP (DOS gcc) makefile for libpng 1# DJGPP (DOS gcc) makefile for libpng
2# Copyright (C) 2002, 2006, 2009-2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 2002, 2006, 2009-2010-2011 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# where make install will put libpng.a and png.h 9# where make install will put libpng.a and png.h
10#prefix=/usr/local 10#prefix=/usr/local
11prefix=. 11prefix=.
12INCPATH=$(prefix)/include 12INCPATH=$(prefix)/include
13LIBPATH=$(prefix)/lib 13LIBPATH=$(prefix)/lib
14 14
15CC=gcc 15CC=gcc
16CFLAGS=-I../zlib -O -DPNG_NO_SNPRINTF 16CFLAGS=-I../zlib -O -DPNG_NO_SNPRINTF
17LDFLAGS=-L. -L../zlib/ -lpng -lz -lm 17LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
18 18
19RANLIB=ranlib 19RANLIB=ranlib
20 20
21OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 21OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
22 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o pngwtran.o \ 22 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o pngwtran.o \
23 pngmem.o pngerror.o pngpread.o 23 pngmem.o pngerror.o pngpread.o
24 24
25all: libpng.a pngtest 25all: libpng.a pngtest
26 26
27# see scripts/pnglibconf.mak for more options 27# see scripts/pnglibconf.mak for more options
28pnglibconf.h: scripts/pnglibconf.h.prebuilt 28pnglibconf.h: scripts/pnglibconf.h.prebuilt
29 cp scripts/pnglibconf.h.prebuilt $@ 29 cp scripts/pnglibconf.h.prebuilt $@
30 30
31libpng.a: $(OBJS) 31libpng.a: $(OBJS)
32 ar rc $@ $(OBJS) 32 ar rc $@ $(OBJS)
33 $(RANLIB) $@ 33 $(RANLIB) $@
34 34
35pngtest: pngtest.o libpng.a 35pngtest: pngtest.o libpng.a
36 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 36 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
37 coff2exe pngtest 37 coff2exe pngtest
38 38
39test: pngtest 39test: pngtest
40 ./pngtest 40 ./pngtest
41clean: 41clean:
42 rm -f *.o libpng.a pngtest pngout.png pnglibconf.h 42 rm -f *.o libpng.a pngtest pngout.png pnglibconf.h
43 43
44# DO NOT DELETE THIS LINE -- make depend depends on it. 44# DO NOT DELETE THIS LINE -- make depend depends on it.
45 45
46png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 46png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
47pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 47pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
48pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 48pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
49pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 49pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
50pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 50pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
51pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 51pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
52pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 52pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
53pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 53pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
54pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 54pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
55pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 55pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
56pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 56pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
57pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 57pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
58pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 58pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
59pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 59pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
60pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 60pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
61 61
62pngtest.o: png.h pngconf.h pnglibconf.h 62pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.elf b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.elf
index ceea7fc..5af43b1 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.elf
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.elf
@@ -1,263 +1,263 @@
1# makefile for libpng.a and libpng15.so on Linux ELF with gcc 1# makefile for libpng.a and libpng15.so on Linux ELF with gcc
2# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs 2# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs
3# and Glenn Randers-Pehrson 3# and Glenn Randers-Pehrson
4# Copyright (C) 1996, 1997 Andreas Dilger 4# Copyright (C) 1996, 1997 Andreas Dilger
5# 5#
6# This code is released under the libpng license. 6# This code is released under the libpng license.
7# For conditions of distribution and use, see the disclaimer 7# For conditions of distribution and use, see the disclaimer
8# and license in png.h 8# and license in png.h
9 9
10# Modified for Debian by Junichi Uekawa and Josselin Mouette 10# Modified for Debian by Junichi Uekawa and Josselin Mouette
11# Major modifications are: 11# Major modifications are:
12# * link libpng explicitly with libz and libm 12# * link libpng explicitly with libz and libm
13# * $(OLDSO).15 is a symlink rather than a different library 13# * $(OLDSO).15 is a symlink rather than a different library
14# * versioned symbols 14# * versioned symbols
15 15
16# Library name: 16# Library name:
17LIBNAME = libpng15 17LIBNAME = libpng15
18PNGMAJ = 15 18PNGMAJ = 15
19 19
20# Shared library names: 20# Shared library names:
21LIBSO=$(LIBNAME).so 21LIBSO=$(LIBNAME).so
22LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 22LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
23LIBSOREL=$(LIBSOMAJ).$(RELEASE) 23LIBSOREL=$(LIBSOMAJ).$(RELEASE)
24OLDSO=libpng.so 24OLDSO=libpng.so
25OLDSOMAJ=libpng.so.15 25OLDSOMAJ=libpng.so.15
26 26
27# Utilities: 27# Utilities:
28AR_RC=ar rc 28AR_RC=ar rc
29CC=gcc 29CC=gcc
30MKDIR_P=mkdir -p 30MKDIR_P=mkdir -p
31LN_SF=ln -sf 31LN_SF=ln -sf
32RANLIB=ranlib 32RANLIB=ranlib
33RM_F=/bin/rm -f 33RM_F=/bin/rm -f
34 34
35# where "make install" puts libpng15.a, libpng15.so*, 35# where "make install" puts libpng15.a, libpng15.so*,
36# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h 36# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h
37# Prefix must be a full pathname. 37# Prefix must be a full pathname.
38prefix=/usr/local 38prefix=/usr/local
39exec_prefix=$(prefix) 39exec_prefix=$(prefix)
40 40
41# Where the zlib library and include files are located. 41# Where the zlib library and include files are located.
42ZLIBLIB=/usr/local/lib 42ZLIBLIB=/usr/local/lib
43ZLIBINC=/usr/local/include 43ZLIBINC=/usr/local/include
44# ZLIBLIB=../zlib 44# ZLIBLIB=../zlib
45# ZLIBINC=../zlib 45# ZLIBINC=../zlib
46 46
47ALIGN= 47ALIGN=
48# for i386: 48# for i386:
49#ALIGN=-malign-loops=2 -malign-functions=2 49#ALIGN=-malign-loops=2 -malign-functions=2
50 50
51WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 51WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
52 -Wmissing-declarations -Wtraditional -Wcast-align \ 52 -Wmissing-declarations -Wtraditional -Wcast-align \
53 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 53 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
54 54
55# for pgcc version 2.95.1, -O3 is buggy; don't use it. 55# for pgcc version 2.95.1, -O3 is buggy; don't use it.
56 56
57CFLAGS=-W -Wall -D_REENTRANT -O2 \ 57CFLAGS=-W -Wall -D_REENTRANT -O2 \
58 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 58 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
59 59
60LDFLAGS=-L. -lpng15 60LDFLAGS=-L. -lpng15
61LDFLAGS_A=libpng.a -lz -lm 61LDFLAGS_A=libpng.a -lz -lm
62LIBADDFLAGS=-lz -lm 62LIBADDFLAGS=-lz -lm
63 63
64 64
65INCPATH=$(prefix)/include 65INCPATH=$(prefix)/include
66LIBPATH=$(exec_prefix)/lib 66LIBPATH=$(exec_prefix)/lib
67MANPATH=$(prefix)/man 67MANPATH=$(prefix)/man
68BINPATH=$(exec_prefix)/bin 68BINPATH=$(exec_prefix)/bin
69 69
70# override DESTDIR= on the make install command line to easily support 70# override DESTDIR= on the make install command line to easily support
71# installing into a temporary location. Example: 71# installing into a temporary location. Example:
72# 72#
73# make install DESTDIR=/tmp/build/libpng 73# make install DESTDIR=/tmp/build/libpng
74# 74#
75# If you're going to install into a temporary location 75# If you're going to install into a temporary location
76# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 76# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
77# you execute make install. 77# you execute make install.
78DESTDIR= 78DESTDIR=
79 79
80DB=$(DESTDIR)$(BINPATH) 80DB=$(DESTDIR)$(BINPATH)
81DI=$(DESTDIR)$(INCPATH) 81DI=$(DESTDIR)$(INCPATH)
82DL=$(DESTDIR)$(LIBPATH) 82DL=$(DESTDIR)$(LIBPATH)
83DM=$(DESTDIR)$(MANPATH) 83DM=$(DESTDIR)$(MANPATH)
84 84
85OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 85OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
86 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 86 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
87 pngwtran.o pngmem.o pngerror.o pngpread.o 87 pngwtran.o pngmem.o pngerror.o pngpread.o
88 88
89OBJSDLL = $(OBJS:.o=.pic.o) 89OBJSDLL = $(OBJS:.o=.pic.o)
90 90
91.SUFFIXES: .c .o .pic.o 91.SUFFIXES: .c .o .pic.o
92 92
93.c.pic.o: 93.c.pic.o:
94 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c 94 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
95 95
96all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config 96all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
97 97
98# see scripts/pnglibconf.mak for more options 98# see scripts/pnglibconf.mak for more options
99pnglibconf.h: scripts/pnglibconf.h.prebuilt 99pnglibconf.h: scripts/pnglibconf.h.prebuilt
100 cp scripts/pnglibconf.h.prebuilt $@ 100 cp scripts/pnglibconf.h.prebuilt $@
101 101
102libpng.a: $(OBJS) 102libpng.a: $(OBJS)
103 $(AR_RC) $@ $(OBJS) 103 $(AR_RC) $@ $(OBJS)
104 $(RANLIB) $@ 104 $(RANLIB) $@
105 105
106libpng.pc: 106libpng.pc:
107 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 107 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
108 -e s!@exec_prefix@!$(exec_prefix)! \ 108 -e s!@exec_prefix@!$(exec_prefix)! \
109 -e s!@libdir@!$(LIBPATH)! \ 109 -e s!@libdir@!$(LIBPATH)! \
110 -e s!@includedir@!$(INCPATH)! \ 110 -e s!@includedir@!$(INCPATH)! \
111 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 111 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
112 112
113libpng.syms: png.h pngconf.h pnglibconf.h 113libpng.syms: png.h pngconf.h pnglibconf.h
114 $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\ 114 $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\
115 awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG15_%s {global:\n",PNGMAJ)}\ 115 awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG15_%s {global:\n",PNGMAJ)}\
116 { for (i=1;i+2<=NF;++i)\ 116 { for (i=1;i+2<=NF;++i)\
117 if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\ 117 if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\
118 print $$(i+1) ";";\ 118 print $$(i+1) ";";\
119 for (i=1;i+1<=NF;++i)\ 119 for (i=1;i+1<=NF;++i)\
120 if ($$(i)=="PNG_DATA_EXPORT")\ 120 if ($$(i)=="PNG_DATA_EXPORT")\
121 print $$(i+1) ";";}\ 121 print $$(i+1) ";";}\
122 END{print "local: *; };"}' >$@.new 122 END{print "local: *; };"}' >$@.new
123 $(RM_F) $@ 123 $(RM_F) $@
124 mv $@.new $@ 124 mv $@.new $@
125 125
126libpng-config: 126libpng-config:
127 ( cat scripts/libpng-config-head.in; \ 127 ( cat scripts/libpng-config-head.in; \
128 echo prefix=\"$(prefix)\"; \ 128 echo prefix=\"$(prefix)\"; \
129 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 129 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
130 echo L_opts=\"\"; \ 130 echo L_opts=\"\"; \
131 echo R_opts=\"\"; \ 131 echo R_opts=\"\"; \
132 echo libs=\"-lpng15\"; \ 132 echo libs=\"-lpng15\"; \
133 echo all_libs=\"-lpng15 $(LIBADDFLAGS)\"; \ 133 echo all_libs=\"-lpng15 $(LIBADDFLAGS)\"; \
134 cat scripts/libpng-config-body.in ) > libpng-config 134 cat scripts/libpng-config-body.in ) > libpng-config
135 chmod +x libpng-config 135 chmod +x libpng-config
136 136
137$(LIBSO): $(LIBSOMAJ) 137$(LIBSO): $(LIBSOMAJ)
138 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 138 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
139 139
140$(LIBSOMAJ): $(OBJSDLL) libpng.syms 140$(LIBSOMAJ): $(OBJSDLL) libpng.syms
141 $(CC) -shared -Wl,-soname,$(LIBSOMAJ) \ 141 $(CC) -shared -Wl,-soname,$(LIBSOMAJ) \
142 -Wl,-version-script,libpng.syms \ 142 -Wl,-version-script,libpng.syms \
143 -o $(LIBSOMAJ) \ 143 -o $(LIBSOMAJ) \
144 $(OBJSDLL) 144 $(OBJSDLL)
145 145
146pngtest: pngtest.o $(LIBSO) 146pngtest: pngtest.o $(LIBSO)
147 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 147 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
148 148
149pngtest-static: pngtest.o libpng.a 149pngtest-static: pngtest.o libpng.a
150 $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A) 150 $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)
151 151
152test: pngtest pngtest-static 152test: pngtest pngtest-static
153 @echo "" 153 @echo ""
154 @echo " Running pngtest dynamically linked with $(LIBSO):" 154 @echo " Running pngtest dynamically linked with $(LIBSO):"
155 @echo "" 155 @echo ""
156 LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}" ./pngtest 156 LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}" ./pngtest
157 @echo "" 157 @echo ""
158 @echo " Running pngtest statically linked with libpng.a:" 158 @echo " Running pngtest statically linked with libpng.a:"
159 @echo "" 159 @echo ""
160 ./pngtest-static 160 ./pngtest-static
161 161
162install-headers: png.h pngconf.h pnglibconf.h 162install-headers: png.h pngconf.h pnglibconf.h
163 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 163 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
164 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 164 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
165 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 165 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
166 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 166 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
167 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 167 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
168 -@$(RM_F) $(DI)/libpng 168 -@$(RM_F) $(DI)/libpng
169 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 169 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
170 170
171install-static: install-headers libpng.a 171install-static: install-headers libpng.a
172 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 172 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
173 cp libpng.a $(DL)/$(LIBNAME).a 173 cp libpng.a $(DL)/$(LIBNAME).a
174 chmod 644 $(DL)/$(LIBNAME).a 174 chmod 644 $(DL)/$(LIBNAME).a
175 -@$(RM_F) $(DL)/libpng.a 175 -@$(RM_F) $(DL)/libpng.a
176 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 176 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
177 177
178install-shared: install-headers $(LIBSOMAJ) libpng.pc 178install-shared: install-headers $(LIBSOMAJ) libpng.pc
179 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 179 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
180 -@$(RM_F) $(DL)/$(LIBSO) 180 -@$(RM_F) $(DL)/$(LIBSO)
181 -@$(RM_F) $(DL)/$(LIBSOREL) 181 -@$(RM_F) $(DL)/$(LIBSOREL)
182 -@$(RM_F) $(DL)/$(OLDSO) 182 -@$(RM_F) $(DL)/$(OLDSO)
183 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 183 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
184 chmod 755 $(DL)/$(LIBSOREL) 184 chmod 755 $(DL)/$(LIBSOREL)
185 (cd $(DL); \ 185 (cd $(DL); \
186 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 186 $(LN_SF) $(LIBSOREL) $(LIBSO); \
187 $(LN_SF) $(LIBSO) $(OLDSO)) 187 $(LN_SF) $(LIBSO) $(OLDSO))
188 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 188 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
189 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 189 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
190 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 190 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
191 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 191 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
192 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 192 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
193 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 193 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
194 194
195install-man: libpng.3 libpngpf.3 png.5 195install-man: libpng.3 libpngpf.3 png.5
196 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 196 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
197 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 197 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
198 -@$(RM_F) $(DM)/man3/libpng.3 198 -@$(RM_F) $(DM)/man3/libpng.3
199 -@$(RM_F) $(DM)/man3/libpngpf.3 199 -@$(RM_F) $(DM)/man3/libpngpf.3
200 cp libpng.3 $(DM)/man3 200 cp libpng.3 $(DM)/man3
201 cp libpngpf.3 $(DM)/man3 201 cp libpngpf.3 $(DM)/man3
202 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 202 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
203 -@$(RM_F) $(DM)/man5/png.5 203 -@$(RM_F) $(DM)/man5/png.5
204 cp png.5 $(DM)/man5 204 cp png.5 $(DM)/man5
205 205
206install-config: libpng-config 206install-config: libpng-config
207 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 207 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
208 -@$(RM_F) $(DB)/libpng-config 208 -@$(RM_F) $(DB)/libpng-config
209 -@$(RM_F) $(DB)/$(LIBNAME)-config 209 -@$(RM_F) $(DB)/$(LIBNAME)-config
210 cp libpng-config $(DB)/$(LIBNAME)-config 210 cp libpng-config $(DB)/$(LIBNAME)-config
211 chmod 755 $(DB)/$(LIBNAME)-config 211 chmod 755 $(DB)/$(LIBNAME)-config
212 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 212 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
213 213
214install: install-static install-shared install-man install-config 214install: install-static install-shared install-man install-config
215 215
216# If you installed in $(DESTDIR), test-installed won't work until you 216# If you installed in $(DESTDIR), test-installed won't work until you
217# move the library to its final location. Use test-dd to test it 217# move the library to its final location. Use test-dd to test it
218# before then. 218# before then.
219 219
220test-dd: 220test-dd:
221 echo 221 echo
222 echo Testing installed dynamic shared library in $(DL). 222 echo Testing installed dynamic shared library in $(DL).
223 $(CC) -I$(DI) -I$(ZLIBINC) \ 223 $(CC) -I$(DI) -I$(ZLIBINC) \
224 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 224 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
225 -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ 225 -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
226 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 226 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
227 ./pngtestd pngtest.png 227 ./pngtestd pngtest.png
228 228
229test-installed: 229test-installed:
230 $(CC) -I$(ZLIBINC) \ 230 $(CC) -I$(ZLIBINC) \
231 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 231 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
232 -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ 232 -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
233 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 233 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
234 ./pngtesti pngtest.png 234 ./pngtesti pngtest.png
235 235
236clean: 236clean:
237 $(RM_F) *.o libpng.a libpng.syms pngtest pngout.png libpng-config \ 237 $(RM_F) *.o libpng.a libpng.syms pngtest pngout.png libpng-config \
238 $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \ 238 $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
239 libpng.pc pnglibconf.h 239 libpng.pc pnglibconf.h
240 240
241DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 241DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
242writelock: 242writelock:
243 chmod a-w *.[ch35] $(DOCS) scripts/* 243 chmod a-w *.[ch35] $(DOCS) scripts/*
244 244
245# DO NOT DELETE THIS LINE -- make depend depends on it. 245# DO NOT DELETE THIS LINE -- make depend depends on it.
246 246
247png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 247png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
248pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 248pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
249pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 249pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
250pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 250pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
251pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 251pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
252pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 252pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
253pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 253pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
254pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 254pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
255pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 255pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
256pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 256pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
257pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 257pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
258pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 258pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
259pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 259pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
260pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 260pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
261pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 261pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
262 262
263pngtest.o: png.h pngconf.h pnglibconf.h 263pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.freebsd b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.freebsd
index ced7be2..994608c 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.freebsd
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.freebsd
@@ -1,53 +1,53 @@
1# makefile for libpng under FreeBSD 1# makefile for libpng under FreeBSD
2# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov 2# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
3# 3#
4# This code is released under the libpng license. 4# This code is released under the libpng license.
5# For conditions of distribution and use, see the disclaimer 5# For conditions of distribution and use, see the disclaimer
6# and license in png.h 6# and license in png.h
7 7
8PREFIX?= /usr/local 8PREFIX?= /usr/local
9SHLIB_VER?= 15 9SHLIB_VER?= 15
10 10
11LIB= png 11LIB= png
12SHLIB_MAJOR= ${SHLIB_VER} 12SHLIB_MAJOR= ${SHLIB_VER}
13SHLIB_MINOR= 0 13SHLIB_MINOR= 0
14NOPROFILE= YES 14NOPROFILE= YES
15NOOBJ= YES 15NOOBJ= YES
16 16
17# where make install puts libpng.a and png.h 17# where make install puts libpng.a and png.h
18DESTDIR= ${PREFIX} 18DESTDIR= ${PREFIX}
19LIBDIR= /lib 19LIBDIR= /lib
20INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 20INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
21INCSDIR= /include/libpng 21INCSDIR= /include/libpng
22INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk 22INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk
23MAN= libpng.3 libpngpf.3 png.5 23MAN= libpng.3 libpngpf.3 png.5
24MANDIR= /man/man 24MANDIR= /man/man
25SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ 25SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
26 libpng/pngconf.h ${INCSDIR}/../pngconf.h \ 26 libpng/pngconf.h ${INCSDIR}/../pngconf.h \
27 libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h 27 libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
28LDADD+= -lm -lz 28LDADD+= -lm -lz
29DPADD+= ${LIBM} ${LIBZ} 29DPADD+= ${LIBM} ${LIBZ}
30 30
31CFLAGS+= -I. 31CFLAGS+= -I.
32 32
33SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ 33SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
34 pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ 34 pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
35 pngwtran.c pngmem.c pngerror.c pngpread.c 35 pngwtran.c pngmem.c pngerror.c pngpread.c
36 36
37pngtest: pngtest.o libpng.a 37pngtest: pngtest.o libpng.a
38 ${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm 38 ${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm
39 39
40CLEANFILES= pngtest pngtest.o pngout.png 40CLEANFILES= pngtest pngtest.o pngout.png
41 41
42test: pngtest 42test: pngtest
43 ./pngtest 43 ./pngtest
44 44
45# see scripts/pnglibconf.mak for more options 45# see scripts/pnglibconf.mak for more options
46pnglibconf.h: scripts/pnglibconf.h.prebuilt 46pnglibconf.h: scripts/pnglibconf.h.prebuilt
47 cp scripts/pnglibconf.h.prebuilt $@ 47 cp scripts/pnglibconf.h.prebuilt $@
48 48
49DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 49DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
50writelock: 50writelock:
51 chmod a-w *.[ch35] $(DOCS) scripts/* 51 chmod a-w *.[ch35] $(DOCS) scripts/*
52 52
53.include <bsd.lib.mk> 53.include <bsd.lib.mk>
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.gcc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.gcc
index c871f7d..2e5b611 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.gcc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.gcc
@@ -1,87 +1,87 @@
1# makefile for libpng using gcc (generic, static library) 1# makefile for libpng using gcc (generic, static library)
2# Copyright (C) 2008 Glenn Randers-Pehrson 2# Copyright (C) 2008 Glenn Randers-Pehrson
3# Copyright (C) 2000 Cosmin Truta 3# Copyright (C) 2000 Cosmin Truta
4# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 4# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
5# 5#
6# This code is released under the libpng license. 6# This code is released under the libpng license.
7# For conditions of distribution and use, see the disclaimer 7# For conditions of distribution and use, see the disclaimer
8# and license in png.h 8# and license in png.h
9 9
10# Location of the zlib library and include files 10# Location of the zlib library and include files
11ZLIBINC = ../zlib 11ZLIBINC = ../zlib
12ZLIBLIB = ../zlib 12ZLIBLIB = ../zlib
13 13
14# Compiler, linker, lib and other tools 14# Compiler, linker, lib and other tools
15CC = gcc 15CC = gcc
16LD = $(CC) 16LD = $(CC)
17AR_RC = ar rcs 17AR_RC = ar rcs
18RANLIB = ranlib 18RANLIB = ranlib
19RM_F = rm -f 19RM_F = rm -f
20 20
21CDEBUG = -g -DPNG_DEBUG=5 21CDEBUG = -g -DPNG_DEBUG=5
22LDDEBUG = 22LDDEBUG =
23CRELEASE = -O2 23CRELEASE = -O2
24LDRELEASE = -s 24LDRELEASE = -s
25#CFLAGS = -W -Wall $(CDEBUG) 25#CFLAGS = -W -Wall $(CDEBUG)
26CFLAGS = -W -Wall $(CRELEASE) 26CFLAGS = -W -Wall $(CRELEASE)
27#LDFLAGS = $(LDDEBUG) 27#LDFLAGS = $(LDDEBUG)
28LDFLAGS = $(LDRELEASE) 28LDFLAGS = $(LDRELEASE)
29LIBS = -lz -lm 29LIBS = -lz -lm
30 30
31# File extensions 31# File extensions
32O=.o 32O=.o
33A=.a 33A=.a
34EXE= 34EXE=
35 35
36# Variables 36# Variables
37OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ 37OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
38 pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \ 38 pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
39 pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) 39 pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
40 40
41# Targets 41# Targets
42all: static 42all: static
43 43
44# see scripts/pnglibconf.mak for more options 44# see scripts/pnglibconf.mak for more options
45pnglibconf.h: scripts/pnglibconf.h.prebuilt 45pnglibconf.h: scripts/pnglibconf.h.prebuilt
46 cp scripts/pnglibconf.h.prebuilt $@ 46 cp scripts/pnglibconf.h.prebuilt $@
47 47
48.c$(O): 48.c$(O):
49 $(CC) -c $(CFLAGS) -I$(ZLIBINC) $< 49 $(CC) -c $(CFLAGS) -I$(ZLIBINC) $<
50 50
51static: libpng$(A) pngtest$(EXE) 51static: libpng$(A) pngtest$(EXE)
52 52
53shared: 53shared:
54 @echo This is a generic makefile that cannot create shared libraries. 54 @echo This is a generic makefile that cannot create shared libraries.
55 @echo Please use a configuration that is specific to your platform. 55 @echo Please use a configuration that is specific to your platform.
56 @false 56 @false
57 57
58libpng$(A): $(OBJS) 58libpng$(A): $(OBJS)
59 $(AR_RC) $@ $(OBJS) 59 $(AR_RC) $@ $(OBJS)
60 $(RANLIB) $@ 60 $(RANLIB) $@
61 61
62test: pngtest$(EXE) 62test: pngtest$(EXE)
63 ./pngtest$(EXE) 63 ./pngtest$(EXE)
64 64
65pngtest$(EXE): pngtest$(O) libpng$(A) 65pngtest$(EXE): pngtest$(O) libpng$(A)
66 $(LD) $(LDFLAGS) -L$(ZLIBLIB) -o $@ pngtest$(O) libpng$(A) $(LIBS) 66 $(LD) $(LDFLAGS) -L$(ZLIBLIB) -o $@ pngtest$(O) libpng$(A) $(LIBS)
67 67
68clean: 68clean:
69 $(RM_F) *$(O) libpng$(A) pngtest$(EXE) pngout.png pnglibconf.h 69 $(RM_F) *$(O) libpng$(A) pngtest$(EXE) pngout.png pnglibconf.h
70 70
71png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 71png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
72pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 72pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
73pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 73pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
74pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 74pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
75pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 75pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
76pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 76pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
77pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 77pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
78pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 78pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
79pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 79pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
80pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 80pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
81pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 81pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
82pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 82pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
83pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 83pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
84pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 84pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
85pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 85pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
86 86
87pngtest$(O): png.h pngconf.h pnglibconf.h 87pngtest$(O): png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hp64 b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hp64
index 0f4f7ac..b5b631d 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hp64
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hp64
@@ -1,224 +1,224 @@
1# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. 1# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
2# Copyright (C) 1999-2002, 2006, 2009, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 1999-2002, 2006, 2009, 2010-2011 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42
4# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard 4# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
5# 5#
6# This code is released under the libpng license. 6# This code is released under the libpng license.
7# For conditions of distribution and use, see the disclaimer 7# For conditions of distribution and use, see the disclaimer
8# and license in png.h 8# and license in png.h
9 9
10# Where the zlib library and include files are located 10# Where the zlib library and include files are located
11ZLIBLIB=/opt/zlib/lib 11ZLIBLIB=/opt/zlib/lib
12ZLIBINC=/opt/zlib/include 12ZLIBINC=/opt/zlib/include
13 13
14# Note that if you plan to build a libpng shared library, zlib must also 14# Note that if you plan to build a libpng shared library, zlib must also
15# be a shared library, which zlib's configure does not do. After running 15# be a shared library, which zlib's configure does not do. After running
16# zlib's configure, edit the appropriate lines of makefile to read: 16# zlib's configure, edit the appropriate lines of makefile to read:
17# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ 17# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \
18# LDSHARED=ld -b 18# LDSHARED=ld -b
19# SHAREDLIB=libz.sl 19# SHAREDLIB=libz.sl
20 20
21# Library name: 21# Library name:
22LIBNAME = libpng15 22LIBNAME = libpng15
23PNGMAJ = 15 23PNGMAJ = 15
24 24
25# Shared library names: 25# Shared library names:
26LIBSO=$(LIBNAME).sl 26LIBSO=$(LIBNAME).sl
27LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) 27LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
28LIBSOREL=$(LIBSOMAJ).$(RELEASE) 28LIBSOREL=$(LIBSOMAJ).$(RELEASE)
29OLDSO=libpng.sl 29OLDSO=libpng.sl
30 30
31# Utilities: 31# Utilities:
32AR_RC=ar rc 32AR_RC=ar rc
33CC=cc 33CC=cc
34MKDIR_P=mkdir -p 34MKDIR_P=mkdir -p
35LN_SF=ln -sf 35LN_SF=ln -sf
36RANLIB=ranlib 36RANLIB=ranlib
37RM_F=/bin/rm -f 37RM_F=/bin/rm -f
38 38
39CFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ 39CFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \
40-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP 40-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP
41# Caution: be sure you have built zlib with the same CFLAGS. 41# Caution: be sure you have built zlib with the same CFLAGS.
42CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ 42CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \
43-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP 43-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP
44 44
45LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm 45LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
46 46
47# where make install puts libpng.a, libpng15.sl, and png.h 47# where make install puts libpng.a, libpng15.sl, and png.h
48prefix=/opt/libpng 48prefix=/opt/libpng
49exec_prefix=$(prefix) 49exec_prefix=$(prefix)
50INCPATH=$(prefix)/include 50INCPATH=$(prefix)/include
51LIBPATH=$(exec_prefix)/lib 51LIBPATH=$(exec_prefix)/lib
52MANPATH=$(prefix)/man 52MANPATH=$(prefix)/man
53BINPATH=$(exec_prefix)/bin 53BINPATH=$(exec_prefix)/bin
54 54
55# override DESTDIR= on the make install command line to easily support 55# override DESTDIR= on the make install command line to easily support
56# installing into a temporary location. Example: 56# installing into a temporary location. Example:
57# 57#
58# make install DESTDIR=/tmp/build/libpng 58# make install DESTDIR=/tmp/build/libpng
59# 59#
60# If you're going to install into a temporary location 60# If you're going to install into a temporary location
61# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 61# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
62# you execute make install. 62# you execute make install.
63DESTDIR= 63DESTDIR=
64 64
65DB=$(DESTDIR)$(BINPATH) 65DB=$(DESTDIR)$(BINPATH)
66DI=$(DESTDIR)$(INCPATH) 66DI=$(DESTDIR)$(INCPATH)
67DL=$(DESTDIR)$(LIBPATH) 67DL=$(DESTDIR)$(LIBPATH)
68DM=$(DESTDIR)$(MANPATH) 68DM=$(DESTDIR)$(MANPATH)
69 69
70OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 70OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
71 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 71 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
72 pngwtran.o pngmem.o pngerror.o pngpread.o 72 pngwtran.o pngmem.o pngerror.o pngpread.o
73 73
74OBJSDLL = $(OBJS:.o=.pic.o) 74OBJSDLL = $(OBJS:.o=.pic.o)
75 75
76.SUFFIXES: .c .o .pic.o 76.SUFFIXES: .c .o .pic.o
77 77
78.c.pic.o: 78.c.pic.o:
79 $(CC) -c $(CFLAGS) +z -o $@ $*.c 79 $(CC) -c $(CFLAGS) +z -o $@ $*.c
80 80
81all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 81all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
82 82
83# see scripts/pnglibconf.mak for more options 83# see scripts/pnglibconf.mak for more options
84pnglibconf.h: scripts/pnglibconf.h.prebuilt 84pnglibconf.h: scripts/pnglibconf.h.prebuilt
85 cp scripts/pnglibconf.h.prebuilt $@ 85 cp scripts/pnglibconf.h.prebuilt $@
86 86
87libpng.a: $(OBJS) 87libpng.a: $(OBJS)
88 $(AR_RC) $@ $(OBJS) 88 $(AR_RC) $@ $(OBJS)
89 $(RANLIB) $@ 89 $(RANLIB) $@
90 90
91libpng.pc: 91libpng.pc:
92 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 92 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
93 -e s!@exec_prefix@!$(exec_prefix)! \ 93 -e s!@exec_prefix@!$(exec_prefix)! \
94 -e s!@libdir@!$(LIBPATH)! \ 94 -e s!@libdir@!$(LIBPATH)! \
95 -e s!@includedir@!$(INCPATH)! \ 95 -e s!@includedir@!$(INCPATH)! \
96 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 96 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
97 97
98libpng-config: 98libpng-config:
99 ( cat scripts/libpng-config-head.in; \ 99 ( cat scripts/libpng-config-head.in; \
100 echo prefix=\"$(prefix)\"; \ 100 echo prefix=\"$(prefix)\"; \
101 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 101 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
102 echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ 102 echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
103 echo L_opts=\"-L$(LIBPATH)\"; \ 103 echo L_opts=\"-L$(LIBPATH)\"; \
104 echo libs=\"-lpng15 -lz -lm\"; \ 104 echo libs=\"-lpng15 -lz -lm\"; \
105 cat scripts/libpng-config-body.in ) > libpng-config 105 cat scripts/libpng-config-body.in ) > libpng-config
106 chmod +x libpng-config 106 chmod +x libpng-config
107 107
108$(LIBSO): $(LIBSOMAJ) 108$(LIBSO): $(LIBSOMAJ)
109 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 109 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
110 110
111$(LIBSOMAJ): $(OBJSDLL) 111$(LIBSOMAJ): $(OBJSDLL)
112 $(LD) -b +s \ 112 $(LD) -b +s \
113 +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL) 113 +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
114 114
115pngtest: pngtest.o libpng.a 115pngtest: pngtest.o libpng.a
116 $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) 116 $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
117 117
118test: pngtest 118test: pngtest
119 ./pngtest 119 ./pngtest
120 120
121install-headers: png.h pngconf.h pnglibconf.h 121install-headers: png.h pngconf.h pnglibconf.h
122 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 122 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
123 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 123 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
124 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 124 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
125 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 125 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
126 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 126 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
127 -@$(RM_F) $(DI)/libpng 127 -@$(RM_F) $(DI)/libpng
128 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 128 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
129 129
130install-static: install-headers libpng.a 130install-static: install-headers libpng.a
131 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 131 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
132 cp libpng.a $(DL)/$(LIBNAME).a 132 cp libpng.a $(DL)/$(LIBNAME).a
133 chmod 644 $(DL)/$(LIBNAME).a 133 chmod 644 $(DL)/$(LIBNAME).a
134 -@$(RM_F) $(DL)/libpng.a 134 -@$(RM_F) $(DL)/libpng.a
135 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 135 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
136 136
137install-shared: install-headers $(LIBSOMAJ) libpng.pc 137install-shared: install-headers $(LIBSOMAJ) libpng.pc
138 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 138 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
139 -@$(RM_F) $(DL)/$(LIBSO) 139 -@$(RM_F) $(DL)/$(LIBSO)
140 -@$(RM_F) $(DL)/$(LIBSOREL) 140 -@$(RM_F) $(DL)/$(LIBSOREL)
141 -@$(RM_F) $(DL)/$(OLDSO) 141 -@$(RM_F) $(DL)/$(OLDSO)
142 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 142 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
143 chmod 755 $(DL)/$(LIBSOREL) 143 chmod 755 $(DL)/$(LIBSOREL)
144 (cd $(DL); \ 144 (cd $(DL); \
145 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 145 $(LN_SF) $(LIBSOREL) $(LIBSO); \
146 $(LN_SF) $(LIBSO) $(OLDSO)) 146 $(LN_SF) $(LIBSO) $(OLDSO))
147 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 147 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
148 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 148 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
149 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 149 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
150 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 150 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
151 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 151 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
152 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 152 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
153 153
154install-man: libpng.3 libpngpf.3 png.5 154install-man: libpng.3 libpngpf.3 png.5
155 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 155 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
156 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 156 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
157 -@$(RM_F) $(DM)/man3/libpng.3 157 -@$(RM_F) $(DM)/man3/libpng.3
158 -@$(RM_F) $(DM)/man3/libpngpf.3 158 -@$(RM_F) $(DM)/man3/libpngpf.3
159 cp libpng.3 $(DM)/man3 159 cp libpng.3 $(DM)/man3
160 cp libpngpf.3 $(DM)/man3 160 cp libpngpf.3 $(DM)/man3
161 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 161 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
162 -@$(RM_F) $(DM)/man5/png.5 162 -@$(RM_F) $(DM)/man5/png.5
163 cp png.5 $(DM)/man5 163 cp png.5 $(DM)/man5
164 164
165install-config: libpng-config 165install-config: libpng-config
166 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 166 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
167 -@$(RM_F) $(DB)/libpng-config 167 -@$(RM_F) $(DB)/libpng-config
168 -@$(RM_F) $(DB)/$(LIBNAME)-config 168 -@$(RM_F) $(DB)/$(LIBNAME)-config
169 cp libpng-config $(DB)/$(LIBNAME)-config 169 cp libpng-config $(DB)/$(LIBNAME)-config
170 chmod 755 $(DB)/$(LIBNAME)-config 170 chmod 755 $(DB)/$(LIBNAME)-config
171 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 171 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
172 172
173install: install-static install-shared install-man install-config 173install: install-static install-shared install-man install-config
174 174
175# If you installed in $(DESTDIR), test-installed won't work until you 175# If you installed in $(DESTDIR), test-installed won't work until you
176# move the library to its final location. Use test-dd to test it 176# move the library to its final location. Use test-dd to test it
177# before then. 177# before then.
178 178
179test-dd: 179test-dd:
180 echo 180 echo
181 echo Testing installed dynamic shared library in $(DL). 181 echo Testing installed dynamic shared library in $(DL).
182 $(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \ 182 $(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \
183 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 183 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
184 -L$(DL) -L$(ZLIBLIB) \ 184 -L$(DL) -L$(ZLIBLIB) \
185 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 185 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
186 ./pngtestd pngtest.png 186 ./pngtestd pngtest.png
187 187
188test-installed: 188test-installed:
189 echo 189 echo
190 echo Testing installed dynamic shared library. 190 echo Testing installed dynamic shared library.
191 $(CC) $(CCFLAGS) \ 191 $(CC) $(CCFLAGS) \
192 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 192 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
193 -L$(ZLIBLIB) \ 193 -L$(ZLIBLIB) \
194 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 194 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
195 ./pngtesti pngtest.png 195 ./pngtesti pngtest.png
196 196
197clean: 197clean:
198 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ 198 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
199 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 199 libpng-config $(LIBSO) $(LIBSOMAJ)* \
200 libpng.pc pnglibconf.h 200 libpng.pc pnglibconf.h
201 201
202DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 202DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
203writelock: 203writelock:
204 chmod a-w *.[ch35] $(DOCS) scripts/* 204 chmod a-w *.[ch35] $(DOCS) scripts/*
205 205
206# DO NOT DELETE THIS LINE -- make depend depends on it. 206# DO NOT DELETE THIS LINE -- make depend depends on it.
207 207
208png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 208png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
209pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 209pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
210pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 210pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
211pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 211pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
212pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 212pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
213pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 213pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
214pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 214pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
215pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 215pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
216pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 216pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
217pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 217pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
218pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 218pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
219pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 219pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
220pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 220pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
221pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 221pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
222pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 222pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
223 223
224pngtest.o: png.h pngconf.h pnglibconf.h 224pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpgcc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpgcc
index 28ca7bb..3fe2117 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpgcc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpgcc
@@ -1,230 +1,230 @@
1# makefile for libpng on HP-UX using GCC with the HP ANSI/C linker. 1# makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.
2# Copyright (C) 2002, 2006-2008, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 2002, 2006-2008, 2010-2011 Glenn Randers-Pehrson
3# Copyright (C) 2001, Laurent faillie 3# Copyright (C) 2001, Laurent faillie
4# Copyright (C) 1998, 1999 Greg Roelofs 4# Copyright (C) 1998, 1999 Greg Roelofs
5# Copyright (C) 1996, 1997 Andreas Dilger 5# Copyright (C) 1996, 1997 Andreas Dilger
6# 6#
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# Library name: 11# Library name:
12LIBNAME = libpng15 12LIBNAME = libpng15
13PNGMAJ = 15 13PNGMAJ = 15
14 14
15# Shared library names: 15# Shared library names:
16LIBSO=$(LIBNAME).sl 16LIBSO=$(LIBNAME).sl
17LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) 17LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
18LIBSOREL=$(LIBSOMAJ).$(RELEASE) 18LIBSOREL=$(LIBSOMAJ).$(RELEASE)
19OLDSO=libpng.sl 19OLDSO=libpng.sl
20 20
21# Utilities: 21# Utilities:
22CC=gcc 22CC=gcc
23LD=ld 23LD=ld
24AR_RC=ar rc 24AR_RC=ar rc
25MKDIR_P=mkdir -p 25MKDIR_P=mkdir -p
26LN_SF=ln -sf 26LN_SF=ln -sf
27RANLIB=ranlib 27RANLIB=ranlib
28RM_F=/bin/rm -f 28RM_F=/bin/rm -f
29 29
30# where "make install" puts libpng.a, $(OLDSO)*, png.h, pngconf.h 30# where "make install" puts libpng.a, $(OLDSO)*, png.h, pngconf.h
31# and pnglibconf.h 31# and pnglibconf.h
32prefix=/usr/local 32prefix=/usr/local
33exec_prefix=$(prefix) 33exec_prefix=$(prefix)
34 34
35# Where the zlib library and include files are located 35# Where the zlib library and include files are located
36ZLIBLIB=/opt/zlib/lib 36ZLIBLIB=/opt/zlib/lib
37ZLIBINC=/opt/zlib/include 37ZLIBINC=/opt/zlib/include
38 38
39# Note that if you plan to build a libpng shared library, zlib must also 39# Note that if you plan to build a libpng shared library, zlib must also
40# be a shared library, which zlib's configure does not do. After running 40# be a shared library, which zlib's configure does not do. After running
41# zlib's configure, edit the appropriate lines of makefile to read: 41# zlib's configure, edit the appropriate lines of makefile to read:
42# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ 42# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \
43# LDSHARED=ld -b 43# LDSHARED=ld -b
44# SHAREDLIB=libz.sl 44# SHAREDLIB=libz.sl
45 45
46ALIGN= 46ALIGN=
47# for i386: 47# for i386:
48#ALIGN=-malign-loops=2 -malign-functions=2 48#ALIGN=-malign-loops=2 -malign-functions=2
49 49
50WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 50WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
51 -Wmissing-declarations -Wtraditional -Wcast-align \ 51 -Wmissing-declarations -Wtraditional -Wcast-align \
52 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 52 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
53 53
54# for pgcc version 2.95.1, -O3 is buggy; don't use it. 54# for pgcc version 2.95.1, -O3 is buggy; don't use it.
55 55
56CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ 56CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
57 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 57 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
58#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm 58#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm
59LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm 59LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm
60 60
61INCPATH=$(prefix)/include 61INCPATH=$(prefix)/include
62LIBPATH=$(exec_prefix)/lib 62LIBPATH=$(exec_prefix)/lib
63MANPATH=$(prefix)/man 63MANPATH=$(prefix)/man
64BINPATH=$(exec_prefix)/bin 64BINPATH=$(exec_prefix)/bin
65 65
66# override DESTDIR= on the make install command line to easily support 66# override DESTDIR= on the make install command line to easily support
67# installing into a temporary location. Example: 67# installing into a temporary location. Example:
68# 68#
69# make install DESTDIR=/tmp/build/libpng 69# make install DESTDIR=/tmp/build/libpng
70# 70#
71# If you're going to install into a temporary location 71# If you're going to install into a temporary location
72# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 72# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
73# you execute make install. 73# you execute make install.
74DESTDIR= 74DESTDIR=
75 75
76DB=$(DESTDIR)$(BINPATH) 76DB=$(DESTDIR)$(BINPATH)
77DI=$(DESTDIR)$(INCPATH) 77DI=$(DESTDIR)$(INCPATH)
78DL=$(DESTDIR)$(LIBPATH) 78DL=$(DESTDIR)$(LIBPATH)
79DM=$(DESTDIR)$(MANPATH) 79DM=$(DESTDIR)$(MANPATH)
80 80
81OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 81OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
82 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 82 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
83 pngwtran.o pngmem.o pngerror.o pngpread.o 83 pngwtran.o pngmem.o pngerror.o pngpread.o
84 84
85OBJSDLL = $(OBJS:.o=.pic.o) 85OBJSDLL = $(OBJS:.o=.pic.o)
86 86
87.SUFFIXES: .c .o .pic.o 87.SUFFIXES: .c .o .pic.o
88 88
89.c.pic.o: 89.c.pic.o:
90 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c 90 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
91 91
92all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 92all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
93 93
94libpng.a: $(OBJS) 94libpng.a: $(OBJS)
95 $(AR_RC) $@ $(OBJS) 95 $(AR_RC) $@ $(OBJS)
96 $(RANLIB) $@ 96 $(RANLIB) $@
97 97
98libpng.pc: 98libpng.pc:
99 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 99 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
100 -e s!@exec_prefix@!$(exec_prefix)! \ 100 -e s!@exec_prefix@!$(exec_prefix)! \
101 -e s!@libdir@!$(LIBPATH)! \ 101 -e s!@libdir@!$(LIBPATH)! \
102 -e s!@includedir@!$(INCPATH)! \ 102 -e s!@includedir@!$(INCPATH)! \
103 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 103 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
104 104
105libpng-config: 105libpng-config:
106 ( cat scripts/libpng-config-head.in; \ 106 ( cat scripts/libpng-config-head.in; \
107 echo prefix=\"$(prefix)\"; \ 107 echo prefix=\"$(prefix)\"; \
108 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 108 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
109 echo libs=\"-lpng15 -lz -lm\"; \ 109 echo libs=\"-lpng15 -lz -lm\"; \
110 cat scripts/libpng-config-body.in ) > libpng-config 110 cat scripts/libpng-config-body.in ) > libpng-config
111 chmod +x libpng-config 111 chmod +x libpng-config
112 112
113$(LIBSO): $(LIBSOMAJ) 113$(LIBSO): $(LIBSOMAJ)
114 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 114 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
115 115
116$(LIBSOMAJ): $(OBJSDLL) 116$(LIBSOMAJ): $(OBJSDLL)
117 $(LD) -b +s \ 117 $(LD) -b +s \
118 +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL) 118 +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
119 119
120pngtest: pngtest.o $(LIBSO) 120pngtest: pngtest.o $(LIBSO)
121 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 121 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
122 122
123test: pngtest 123test: pngtest
124 ./pngtest 124 ./pngtest
125 125
126 126
127install-headers: png.h pngconf.h pnglibconf.h 127install-headers: png.h pngconf.h pnglibconf.h
128 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 128 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
129 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 129 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
130 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 130 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
131 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 131 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
132 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 132 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
133 -@$(RM_F) $(DI)/libpng 133 -@$(RM_F) $(DI)/libpng
134 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 134 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
135 135
136install-static: install-headers libpng.a 136install-static: install-headers libpng.a
137 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 137 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
138 cp libpng.a $(DL)/$(LIBNAME).a 138 cp libpng.a $(DL)/$(LIBNAME).a
139 chmod 644 $(DL)/$(LIBNAME).a 139 chmod 644 $(DL)/$(LIBNAME).a
140 -@$(RM_F) $(DL)/libpng.a 140 -@$(RM_F) $(DL)/libpng.a
141 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 141 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
142 142
143install-shared: install-headers $(LIBSOMAJ) libpng.pc 143install-shared: install-headers $(LIBSOMAJ) libpng.pc
144 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 144 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
145 -@$(RM_F) $(DL)/$(LIBSO) 145 -@$(RM_F) $(DL)/$(LIBSO)
146 -@$(RM_F) $(DL)/$(LIBSOREL) 146 -@$(RM_F) $(DL)/$(LIBSOREL)
147 -@$(RM_F) $(DL)/$(OLDSO) 147 -@$(RM_F) $(DL)/$(OLDSO)
148 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 148 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
149 chmod 755 $(DL)/$(LIBSOREL) 149 chmod 755 $(DL)/$(LIBSOREL)
150 (cd $(DL); \ 150 (cd $(DL); \
151 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 151 $(LN_SF) $(LIBSOREL) $(LIBSO); \
152 $(LN_SF) $(LIBSO) $(OLDSO)) 152 $(LN_SF) $(LIBSO) $(OLDSO))
153 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 153 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
154 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 154 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
155 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 155 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
156 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 156 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
157 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 157 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
158 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 158 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
159 159
160install-man: libpng.3 libpngpf.3 png.5 160install-man: libpng.3 libpngpf.3 png.5
161 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 161 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
162 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 162 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
163 -@$(RM_F) $(DM)/man3/libpng.3 163 -@$(RM_F) $(DM)/man3/libpng.3
164 -@$(RM_F) $(DM)/man3/libpngpf.3 164 -@$(RM_F) $(DM)/man3/libpngpf.3
165 cp libpng.3 $(DM)/man3 165 cp libpng.3 $(DM)/man3
166 cp libpngpf.3 $(DM)/man3 166 cp libpngpf.3 $(DM)/man3
167 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 167 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
168 -@$(RM_F) $(DM)/man5/png.5 168 -@$(RM_F) $(DM)/man5/png.5
169 cp png.5 $(DM)/man5 169 cp png.5 $(DM)/man5
170 170
171install-config: libpng-config 171install-config: libpng-config
172 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 172 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
173 -@$(RM_F) $(DB)/libpng-config 173 -@$(RM_F) $(DB)/libpng-config
174 -@$(RM_F) $(DB)/$(LIBNAME)-config 174 -@$(RM_F) $(DB)/$(LIBNAME)-config
175 cp libpng-config $(DB)/$(LIBNAME)-config 175 cp libpng-config $(DB)/$(LIBNAME)-config
176 chmod 755 $(DB)/$(LIBNAME)-config 176 chmod 755 $(DB)/$(LIBNAME)-config
177 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 177 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
178 178
179install: install-static install-shared install-man install-config 179install: install-static install-shared install-man install-config
180 180
181# If you installed in $(DESTDIR), test-installed won't work until you 181# If you installed in $(DESTDIR), test-installed won't work until you
182# move the library to its final location. Use test-dd to test it 182# move the library to its final location. Use test-dd to test it
183# before then. 183# before then.
184 184
185test-dd: 185test-dd:
186 echo 186 echo
187 echo Testing installed dynamic shared library in $(DL). 187 echo Testing installed dynamic shared library in $(DL).
188 $(CC) -I$(DI) -I$(ZLIBINC) \ 188 $(CC) -I$(DI) -I$(ZLIBINC) \
189 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 189 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
190 -L$(DL) -L$(ZLIBLIB) -Wl,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ 190 -L$(DL) -L$(ZLIBLIB) -Wl,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
191 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 191 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
192 ./pngtestd pngtest.png 192 ./pngtestd pngtest.png
193 193
194test-installed: 194test-installed:
195 echo 195 echo
196 echo Testing installed dynamic shared library. 196 echo Testing installed dynamic shared library.
197 $(CC) -I$(ZLIBINC) \ 197 $(CC) -I$(ZLIBINC) \
198 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 198 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
199 -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ 199 -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
200 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 200 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
201 ./pngtesti pngtest.png 201 ./pngtesti pngtest.png
202 202
203clean: 203clean:
204 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ 204 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
205 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 205 libpng-config $(LIBSO) $(LIBSOMAJ)* \
206 libpng.pc pnglibconf.h 206 libpng.pc pnglibconf.h
207 207
208DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 208DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
209writelock: 209writelock:
210 chmod a-w *.[ch35] $(DOCS) scripts/* 210 chmod a-w *.[ch35] $(DOCS) scripts/*
211 211
212# DO NOT DELETE THIS LINE -- make depend depends on it. 212# DO NOT DELETE THIS LINE -- make depend depends on it.
213 213
214png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 214png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
215pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 215pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
216pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 216pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
217pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 217pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
218pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 218pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
219pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 219pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
220pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 220pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
221pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 221pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
222pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 222pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
223pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 223pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
224pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 224pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
225pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 227pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
228pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 228pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
229 229
230pngtest.o: png.h pngconf.h pnglibconf.h 230pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpux b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpux
index fd3a20d..650ab4f 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpux
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.hpux
@@ -1,221 +1,221 @@
1# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. 1# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
2# Copyright (C) 1999-2002, 2006, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 1999-2002, 2006, 2010-2011 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42
4# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard 4# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
5# 5#
6# This code is released under the libpng license. 6# This code is released under the libpng license.
7# For conditions of distribution and use, see the disclaimer 7# For conditions of distribution and use, see the disclaimer
8# and license in png.h 8# and license in png.h
9 9
10# Where the zlib library and include files are located 10# Where the zlib library and include files are located
11ZLIBLIB=/opt/zlib/lib 11ZLIBLIB=/opt/zlib/lib
12ZLIBINC=/opt/zlib/include 12ZLIBINC=/opt/zlib/include
13 13
14# Note that if you plan to build a libpng shared library, zlib must also 14# Note that if you plan to build a libpng shared library, zlib must also
15# be a shared library, which zlib's configure does not do. After running 15# be a shared library, which zlib's configure does not do. After running
16# zlib's configure, edit the appropriate lines of makefile to read: 16# zlib's configure, edit the appropriate lines of makefile to read:
17# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ 17# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \
18# LDSHARED=ld -b 18# LDSHARED=ld -b
19# SHAREDLIB=libz.sl 19# SHAREDLIB=libz.sl
20 20
21# Library name: 21# Library name:
22LIBNAME = libpng15 22LIBNAME = libpng15
23PNGMAJ = 15 23PNGMAJ = 15
24 24
25# Shared library names: 25# Shared library names:
26LIBSO=$(LIBNAME).sl 26LIBSO=$(LIBNAME).sl
27LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) 27LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
28LIBSOREL=$(LIBSOMAJ).$(RELEASE) 28LIBSOREL=$(LIBSOMAJ).$(RELEASE)
29OLDSO=libpng.sl 29OLDSO=libpng.sl
30 30
31# Utilities: 31# Utilities:
32AR_RC=ar rc 32AR_RC=ar rc
33CC=cc 33CC=cc
34MKDIR_P=mkdir -p 34MKDIR_P=mkdir -p
35LN_SF=ln -sf 35LN_SF=ln -sf
36RANLIB=ranlib 36RANLIB=ranlib
37RM_F=/bin/rm -f 37RM_F=/bin/rm -f
38 38
39# where make install puts libpng.a, libpng15.sl, and png.h 39# where make install puts libpng.a, libpng15.sl, and png.h
40prefix=/opt/libpng 40prefix=/opt/libpng
41exec_prefix=$(prefix) 41exec_prefix=$(prefix)
42INCPATH=$(prefix)/include 42INCPATH=$(prefix)/include
43LIBPATH=$(exec_prefix)/lib 43LIBPATH=$(exec_prefix)/lib
44MANPATH=$(prefix)/man 44MANPATH=$(prefix)/man
45BINPATH=$(exec_prefix)/bin 45BINPATH=$(exec_prefix)/bin
46 46
47CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 47CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
48# Caution: be sure you have built zlib with the same CFLAGS. 48# Caution: be sure you have built zlib with the same CFLAGS.
49CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 49CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
50LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm 50LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
51 51
52# override DESTDIR= on the make install command line to easily support 52# override DESTDIR= on the make install command line to easily support
53# installing into a temporary location. Example: 53# installing into a temporary location. Example:
54# 54#
55# make install DESTDIR=/tmp/build/libpng 55# make install DESTDIR=/tmp/build/libpng
56# 56#
57# If you're going to install into a temporary location 57# If you're going to install into a temporary location
58# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 58# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
59# you execute make install. 59# you execute make install.
60DESTDIR= 60DESTDIR=
61 61
62DB=$(DESTDIR)$(BINPATH) 62DB=$(DESTDIR)$(BINPATH)
63DI=$(DESTDIR)$(INCPATH) 63DI=$(DESTDIR)$(INCPATH)
64DL=$(DESTDIR)$(LIBPATH) 64DL=$(DESTDIR)$(LIBPATH)
65DM=$(DESTDIR)$(MANPATH) 65DM=$(DESTDIR)$(MANPATH)
66 66
67OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 67OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
68 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 68 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
69 pngwtran.o pngmem.o pngerror.o pngpread.o 69 pngwtran.o pngmem.o pngerror.o pngpread.o
70 70
71OBJSDLL = $(OBJS:.o=.pic.o) 71OBJSDLL = $(OBJS:.o=.pic.o)
72 72
73.SUFFIXES: .c .o .pic.o 73.SUFFIXES: .c .o .pic.o
74 74
75.c.pic.o: 75.c.pic.o:
76 $(CC) -c $(CFLAGS) +z -o $@ $*.c 76 $(CC) -c $(CFLAGS) +z -o $@ $*.c
77 77
78all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 78all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
79 79
80# see scripts/pnglibconf.mak for more options 80# see scripts/pnglibconf.mak for more options
81pnglibconf.h: scripts/pnglibconf.h.prebuilt 81pnglibconf.h: scripts/pnglibconf.h.prebuilt
82 cp scripts/pnglibconf.h.prebuilt $@ 82 cp scripts/pnglibconf.h.prebuilt $@
83 83
84libpng.a: $(OBJS) 84libpng.a: $(OBJS)
85 $(AR_RC) $@ $(OBJS) 85 $(AR_RC) $@ $(OBJS)
86 $(RANLIB) $@ 86 $(RANLIB) $@
87 87
88libpng.pc: 88libpng.pc:
89 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 89 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
90 -e s!@exec_prefix@!$(exec_prefix)! \ 90 -e s!@exec_prefix@!$(exec_prefix)! \
91 -e s!@libdir@!$(LIBPATH)! \ 91 -e s!@libdir@!$(LIBPATH)! \
92 -e s!@includedir@!$(INCPATH)! \ 92 -e s!@includedir@!$(INCPATH)! \
93 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 93 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
94 94
95libpng-config: 95libpng-config:
96 ( cat scripts/libpng-config-head.in; \ 96 ( cat scripts/libpng-config-head.in; \
97 echo prefix=\"$(prefix)\"; \ 97 echo prefix=\"$(prefix)\"; \
98 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 98 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
99 echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ 99 echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
100 echo L_opts=\"-L$(LIBPATH)\"; \ 100 echo L_opts=\"-L$(LIBPATH)\"; \
101 echo libs=\"-lpng15 -lz -lm\"; \ 101 echo libs=\"-lpng15 -lz -lm\"; \
102 cat scripts/libpng-config-body.in ) > libpng-config 102 cat scripts/libpng-config-body.in ) > libpng-config
103 chmod +x libpng-config 103 chmod +x libpng-config
104 104
105$(LIBSO): $(LIBSOMAJ) 105$(LIBSO): $(LIBSOMAJ)
106 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 106 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
107 107
108$(LIBSOMAJ): $(OBJSDLL) 108$(LIBSOMAJ): $(OBJSDLL)
109 $(LD) -b +s \ 109 $(LD) -b +s \
110 +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL) 110 +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
111 111
112pngtest: pngtest.o libpng.a 112pngtest: pngtest.o libpng.a
113 $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) 113 $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
114 114
115test: pngtest 115test: pngtest
116 ./pngtest 116 ./pngtest
117 117
118install-headers: png.h pngconf.h pnglibconf.h 118install-headers: png.h pngconf.h pnglibconf.h
119 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 119 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
120 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 120 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
121 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 121 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
122 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 122 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
123 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 123 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
124 -@$(RM_F) $(DI)/libpng 124 -@$(RM_F) $(DI)/libpng
125 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 125 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
126 126
127install-static: install-headers libpng.a 127install-static: install-headers libpng.a
128 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 128 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
129 cp libpng.a $(DL)/$(LIBNAME).a 129 cp libpng.a $(DL)/$(LIBNAME).a
130 chmod 644 $(DL)/$(LIBNAME).a 130 chmod 644 $(DL)/$(LIBNAME).a
131 -@$(RM_F) $(DL)/libpng.a 131 -@$(RM_F) $(DL)/libpng.a
132 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 132 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
133 133
134install-shared: install-headers $(LIBSOMAJ) libpng.pc 134install-shared: install-headers $(LIBSOMAJ) libpng.pc
135 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 135 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
136 -@$(RM_F) $(DL)/$(LIBSO) 136 -@$(RM_F) $(DL)/$(LIBSO)
137 -@$(RM_F) $(DL)/$(LIBSOREL) 137 -@$(RM_F) $(DL)/$(LIBSOREL)
138 -@$(RM_F) $(DL)/$(OLDSO) 138 -@$(RM_F) $(DL)/$(OLDSO)
139 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 139 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
140 chmod 755 $(DL)/$(LIBSOREL) 140 chmod 755 $(DL)/$(LIBSOREL)
141 (cd $(DL); \ 141 (cd $(DL); \
142 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 142 $(LN_SF) $(LIBSOREL) $(LIBSO); \
143 $(LN_SF) $(LIBSO) $(OLDSO)) 143 $(LN_SF) $(LIBSO) $(OLDSO))
144 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 144 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
145 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 145 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
146 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 146 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
147 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 147 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
148 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 148 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
149 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 149 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
150 150
151install-man: libpng.3 libpngpf.3 png.5 151install-man: libpng.3 libpngpf.3 png.5
152 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 152 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
153 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 153 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
154 -@$(RM_F) $(DM)/man3/libpng.3 154 -@$(RM_F) $(DM)/man3/libpng.3
155 -@$(RM_F) $(DM)/man3/libpngpf.3 155 -@$(RM_F) $(DM)/man3/libpngpf.3
156 cp libpng.3 $(DM)/man3 156 cp libpng.3 $(DM)/man3
157 cp libpngpf.3 $(DM)/man3 157 cp libpngpf.3 $(DM)/man3
158 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 158 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
159 -@$(RM_F) $(DM)/man5/png.5 159 -@$(RM_F) $(DM)/man5/png.5
160 cp png.5 $(DM)/man5 160 cp png.5 $(DM)/man5
161 161
162install-config: libpng-config 162install-config: libpng-config
163 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 163 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
164 -@$(RM_F) $(DB)/libpng-config 164 -@$(RM_F) $(DB)/libpng-config
165 -@$(RM_F) $(DB)/$(LIBNAME)-config 165 -@$(RM_F) $(DB)/$(LIBNAME)-config
166 cp libpng-config $(DB)/$(LIBNAME)-config 166 cp libpng-config $(DB)/$(LIBNAME)-config
167 chmod 755 $(DB)/$(LIBNAME)-config 167 chmod 755 $(DB)/$(LIBNAME)-config
168 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 168 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
169 169
170install: install-static install-shared install-man install-config 170install: install-static install-shared install-man install-config
171 171
172# If you installed in $(DESTDIR), test-installed won't work until you 172# If you installed in $(DESTDIR), test-installed won't work until you
173# move the library to its final location. Use test-dd to test it 173# move the library to its final location. Use test-dd to test it
174# before then. 174# before then.
175 175
176test-dd: 176test-dd:
177 echo 177 echo
178 echo Testing installed dynamic shared library in $(DL). 178 echo Testing installed dynamic shared library in $(DL).
179 $(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \ 179 $(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \
180 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 180 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
181 -L$(DL) -L$(ZLIBLIB) \ 181 -L$(DL) -L$(ZLIBLIB) \
182 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 182 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
183 ./pngtestd pngtest.png 183 ./pngtestd pngtest.png
184 184
185test-installed: 185test-installed:
186 echo 186 echo
187 echo Testing installed dynamic shared library. 187 echo Testing installed dynamic shared library.
188 $(CC) $(CCFLAGS) \ 188 $(CC) $(CCFLAGS) \
189 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 189 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
190 -L$(ZLIBLIB) \ 190 -L$(ZLIBLIB) \
191 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 191 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
192 ./pngtesti pngtest.png 192 ./pngtesti pngtest.png
193 193
194clean: 194clean:
195 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ 195 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
196 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 196 libpng-config $(LIBSO) $(LIBSOMAJ)* \
197 libpng.pc pnglibconf.h 197 libpng.pc pnglibconf.h
198 198
199DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 199DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
200writelock: 200writelock:
201 chmod a-w *.[ch35] $(DOCS) scripts/* 201 chmod a-w *.[ch35] $(DOCS) scripts/*
202 202
203# DO NOT DELETE THIS LINE -- make depend depends on it. 203# DO NOT DELETE THIS LINE -- make depend depends on it.
204 204
205png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 205png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
206pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 206pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
207pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 207pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
208pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 208pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
209pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 209pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
210pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 210pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
211pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 211pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
212pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 212pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
213pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 213pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
214pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 214pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
215pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 215pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
216pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 216pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
217pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 217pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
218pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 218pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
219pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 219pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
220 220
221pngtest.o: png.h pngconf.h pnglibconf.h 221pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ibmc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ibmc
index 8c9440a..209d513 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ibmc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ibmc
@@ -1,82 +1,82 @@
1# Makefile for libpng (static) 1# Makefile for libpng (static)
2# IBM C version 3.x for Win32 and OS/2 2# IBM C version 3.x for Win32 and OS/2
3# Copyright (C) 2006 Glenn Randers-Pehrson 3# Copyright (C) 2006 Glenn Randers-Pehrson
4# Copyright (C) 2000 Cosmin Truta 4# Copyright (C) 2000 Cosmin Truta
5# 5#
6# This code is released under the libpng license. 6# This code is released under the libpng license.
7# For conditions of distribution and use, see the disclaimer 7# For conditions of distribution and use, see the disclaimer
8# and license in png.h 8# and license in png.h
9# 9#
10# Notes: 10# Notes:
11# Derived from makefile.std 11# Derived from makefile.std
12# All modules are compiled in C mode 12# All modules are compiled in C mode
13# Tested under Win32, expected to work under OS/2 13# Tested under Win32, expected to work under OS/2
14# Can be easily adapted for IBM VisualAge/C++ for AIX 14# Can be easily adapted for IBM VisualAge/C++ for AIX
15 15
16# Location of the zlib library and include files 16# Location of the zlib library and include files
17ZLIBINC = ../zlib 17ZLIBINC = ../zlib
18ZLIBLIB = ../zlib 18ZLIBLIB = ../zlib
19 19
20# Compiler, linker, lib and other tools 20# Compiler, linker, lib and other tools
21CC = icc 21CC = icc
22LD = ilink 22LD = ilink
23AR = ilib 23AR = ilib
24RM = del 24RM = del
25 25
26CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3 26CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3
27LDFLAGS = 27LDFLAGS =
28 28
29# File extensions 29# File extensions
30O=.obj 30O=.obj
31A=.lib 31A=.lib
32E=.exe 32E=.exe
33 33
34# Variables 34# Variables
35OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ 35OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
36 pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \ 36 pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
37 pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) 37 pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
38 38
39LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A) 39LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A)
40 40
41# Targets 41# Targets
42all: libpng$(A) pngtest$(E) 42all: libpng$(A) pngtest$(E)
43 43
44# see scripts/pnglibconf.mak for more options 44# see scripts/pnglibconf.mak for more options
45pnglibconf.h: scripts/pnglibconf.h.prebuilt 45pnglibconf.h: scripts/pnglibconf.h.prebuilt
46 cp scripts/pnglibconf.h.prebuilt $@ 46 cp scripts/pnglibconf.h.prebuilt $@
47 47
48libpng$(A): $(OBJS) 48libpng$(A): $(OBJS)
49 $(AR) -out:$@ $(OBJS) 49 $(AR) -out:$@ $(OBJS)
50 50
51test: pngtest$(E) 51test: pngtest$(E)
52 pngtest$(E) 52 pngtest$(E)
53 53
54pngtest: pngtest$(E) 54pngtest: pngtest$(E)
55 55
56pngtest$(E): pngtest$(O) libpng$(A) 56pngtest$(E): pngtest$(O) libpng$(A)
57 $(LD) $(LDFLAGS) pngtest$(O) $(LIBS) 57 $(LD) $(LDFLAGS) pngtest$(O) $(LIBS)
58 58
59clean: 59clean:
60 $(RM) *$(O) 60 $(RM) *$(O)
61 $(RM) libpng$(A) 61 $(RM) libpng$(A)
62 $(RM) pnglibconf.h 62 $(RM) pnglibconf.h
63 $(RM) pngtest$(E) 63 $(RM) pngtest$(E)
64 $(RM) pngout.png 64 $(RM) pngout.png
65 65
66png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 66png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
67pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 67pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
68pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 68pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
69pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 69pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
70pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 70pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
71pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 71pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
72pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 72pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
73pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 73pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
74pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 74pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
75pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 75pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
76pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 76pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
77pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 77pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
78pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 78pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
79pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 79pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
80pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 80pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
81 81
82pngtest$(O): png.h pngconf.h pnglibconf.h 82pngtest$(O): png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.intel b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.intel
index 4231078..1cb9ef3 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.intel
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.intel
@@ -1,110 +1,110 @@
1# Makefile for libpng 1# Makefile for libpng
2# Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later 2# Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later
3 3
4# Copyright (C) 2006 Glenn Randers-Pehrson 4# Copyright (C) 2006 Glenn Randers-Pehrson
5# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is 5# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
6# copyright 1995 Guy Eric Schalnat, Group 42, Inc. 6# copyright 1995 Guy Eric Schalnat, Group 42, Inc.
7# 7#
8# This code is released under the libpng license. 8# This code is released under the libpng license.
9# For conditions of distribution and use, see the disclaimer 9# For conditions of distribution and use, see the disclaimer
10# and license in png.h 10# and license in png.h
11# 11#
12# To use, do "nmake /f scripts\makefile.intel" 12# To use, do "nmake /f scripts\makefile.intel"
13# 13#
14# ------------------- Intel C/C++ Compiler 4.0 and later ------------------- 14# ------------------- Intel C/C++ Compiler 4.0 and later -------------------
15 15
16# Where the zlib library and include files are located 16# Where the zlib library and include files are located
17ZLIBLIB=..\zlib 17ZLIBLIB=..\zlib
18ZLIBINC=..\zlib 18ZLIBINC=..\zlib
19 19
20# Target CPU 20# Target CPU
21CPU=6 # Pentium II 21CPU=6 # Pentium II
22#CPU=5 # Pentium 22#CPU=5 # Pentium
23 23
24# Calling convention 24# Calling convention
25CALLING=r # __fastcall 25CALLING=r # __fastcall
26#CALLING=z # __stdcall 26#CALLING=z # __stdcall
27#CALLING=d # __cdecl 27#CALLING=d # __cdecl
28 28
29# Uncomment next to put error messages in a file 29# Uncomment next to put error messages in a file
30#ERRFILE=>>pngerrs 30#ERRFILE=>>pngerrs
31 31
32# -------------------------------------------------------------------------- 32# --------------------------------------------------------------------------
33 33
34CC=icl -c 34CC=icl -c
35CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo 35CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo
36LD=link 36LD=link
37LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO 37LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO
38 38
39O=.obj 39O=.obj
40 40
41OBJS=png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) \ 41OBJS=png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) \
42pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) \ 42pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) \
43pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) 43pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
44 44
45all: test 45all: test
46 46
47# see scripts/pnglibconf.mak for more options 47# see scripts/pnglibconf.mak for more options
48pnglibconf.h: scripts/pnglibconf.h.prebuilt 48pnglibconf.h: scripts/pnglibconf.h.prebuilt
49 cp scripts/pnglibconf.h.prebuilt $@ 49 cp scripts/pnglibconf.h.prebuilt $@
50 50
51png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 51png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
52 $(CC) $(CFLAGS) $*.c $(ERRFILE) 52 $(CC) $(CFLAGS) $*.c $(ERRFILE)
53 53
54pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 54pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
55 $(CC) $(CFLAGS) $*.c $(ERRFILE) 55 $(CC) $(CFLAGS) $*.c $(ERRFILE)
56 56
57pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 57pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
58 $(CC) $(CFLAGS) $*.c $(ERRFILE) 58 $(CC) $(CFLAGS) $*.c $(ERRFILE)
59 59
60pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 60pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
61 $(CC) $(CFLAGS) $*.c $(ERRFILE) 61 $(CC) $(CFLAGS) $*.c $(ERRFILE)
62 62
63pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 63pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
64 $(CC) $(CFLAGS) $*.c $(ERRFILE) 64 $(CC) $(CFLAGS) $*.c $(ERRFILE)
65 65
66pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 66pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
67 $(CC) $(CFLAGS) $*.c $(ERRFILE) 67 $(CC) $(CFLAGS) $*.c $(ERRFILE)
68 68
69pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 69pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
70 $(CC) $(CFLAGS) $*.c $(ERRFILE) 70 $(CC) $(CFLAGS) $*.c $(ERRFILE)
71 71
72pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 72pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
73 $(CC) $(CFLAGS) $*.c $(ERRFILE) 73 $(CC) $(CFLAGS) $*.c $(ERRFILE)
74 74
75pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 75pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
76 $(CC) $(CFLAGS) $*.c $(ERRFILE) 76 $(CC) $(CFLAGS) $*.c $(ERRFILE)
77 77
78pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 78pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
79 $(CC) $(CFLAGS) $*.c $(ERRFILE) 79 $(CC) $(CFLAGS) $*.c $(ERRFILE)
80 80
81pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 81pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
82 $(CC) $(CFLAGS) $*.c $(ERRFILE) 82 $(CC) $(CFLAGS) $*.c $(ERRFILE)
83 83
84pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 84pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
85 $(CC) $(CFLAGS) $*.c $(ERRFILE) 85 $(CC) $(CFLAGS) $*.c $(ERRFILE)
86 86
87pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 87pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
88 $(CC) $(CFLAGS) $*.c $(ERRFILE) 88 $(CC) $(CFLAGS) $*.c $(ERRFILE)
89 89
90pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 90pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
91 $(CC) $(CFLAGS) $*.c $(ERRFILE) 91 $(CC) $(CFLAGS) $*.c $(ERRFILE)
92 92
93pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 93pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
94 $(CC) $(CFLAGS) $*.c $(ERRFILE) 94 $(CC) $(CFLAGS) $*.c $(ERRFILE)
95 95
96libpng.lib: $(OBJS) 96libpng.lib: $(OBJS)
97 if exist libpng.lib del libpng.lib 97 if exist libpng.lib del libpng.lib
98 lib /NOLOGO /OUT:libpng.lib $(OBJS) 98 lib /NOLOGO /OUT:libpng.lib $(OBJS)
99 99
100pngtest.exe: pngtest.obj libpng.lib 100pngtest.exe: pngtest.obj libpng.lib
101 $(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib 101 $(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib
102 102
103pngtest$(O): png.h pngconf.h pnglibconf.h 103pngtest$(O): png.h pngconf.h pnglibconf.h
104 $(CC) $(CFLAGS) $*.c $(ERRFILE) 104 $(CC) $(CFLAGS) $*.c $(ERRFILE)
105 105
106test: pngtest.exe 106test: pngtest.exe
107 pngtest.exe 107 pngtest.exe
108 108
109 109
110# End of makefile for libpng 110# End of makefile for libpng
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.knr b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.knr
index 912c542..18a39f5 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.knr
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.knr
@@ -1,109 +1,109 @@
1# makefile for libpng 1# makefile for libpng
2# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson 2# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# This makefile requires the file ansi2knr.c, which you can get 9# This makefile requires the file ansi2knr.c, which you can get
10# from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/ 10# from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/
11# If you have libjpeg, you probably already have ansi2knr.c in the jpeg 11# If you have libjpeg, you probably already have ansi2knr.c in the jpeg
12# source distribution. 12# source distribution.
13 13
14# where make install puts libpng.a and png.h 14# where make install puts libpng.a and png.h
15prefix=/usr/local 15prefix=/usr/local
16INCPATH=$(prefix)/include 16INCPATH=$(prefix)/include
17LIBPATH=$(prefix)/lib 17LIBPATH=$(prefix)/lib
18 18
19# override DESTDIR= on the make install command line to easily support 19# override DESTDIR= on the make install command line to easily support
20# installing into a temporary location. Example: 20# installing into a temporary location. Example:
21# 21#
22# make install DESTDIR=/tmp/build/libpng 22# make install DESTDIR=/tmp/build/libpng
23# 23#
24# If you're going to install into a temporary location 24# If you're going to install into a temporary location
25# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 25# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
26# you execute make install. 26# you execute make install.
27DESTDIR= 27DESTDIR=
28 28
29CC=cc 29CC=cc
30CFLAGS=-I../zlib -O 30CFLAGS=-I../zlib -O
31LDFLAGS=-L. -L../zlib/ -lpng -lz -lm 31LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
32# flags for ansi2knr 32# flags for ansi2knr
33ANSI2KNRFLAGS= 33ANSI2KNRFLAGS=
34 34
35RANLIB=ranlib 35RANLIB=ranlib
36#RANLIB=echo 36#RANLIB=echo
37 37
38OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 38OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
39 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 39 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
40 pngwtran.o pngmem.o pngerror.o pngpread.o 40 pngwtran.o pngmem.o pngerror.o pngpread.o
41 41
42all: ansi2knr libpng.a pngtest 42all: ansi2knr libpng.a pngtest
43 43
44# see scripts/pnglibconf.mak for more options 44# see scripts/pnglibconf.mak for more options
45pnglibconf.h: scripts/pnglibconf.h.prebuilt 45pnglibconf.h: scripts/pnglibconf.h.prebuilt
46 cp scripts/pnglibconf.h.prebuilt $@ 46 cp scripts/pnglibconf.h.prebuilt $@
47 47
48# general rule to allow ansi2knr to work 48# general rule to allow ansi2knr to work
49.c.o: 49.c.o:
50 ./ansi2knr $*.c T$*.c 50 ./ansi2knr $*.c T$*.c
51 $(CC) $(CFLAGS) -c T$*.c 51 $(CC) $(CFLAGS) -c T$*.c
52 rm -f T$*.c $*.o 52 rm -f T$*.c $*.o
53 mv T$*.o $*.o 53 mv T$*.o $*.o
54 54
55ansi2knr: ansi2knr.c 55ansi2knr: ansi2knr.c
56 $(CC) $(CFLAGS) $(ANSI2KNRFLAGS) -o ansi2knr ansi2knr.c 56 $(CC) $(CFLAGS) $(ANSI2KNRFLAGS) -o ansi2knr ansi2knr.c
57 57
58libpng.a: ansi2knr $(OBJS) 58libpng.a: ansi2knr $(OBJS)
59 ar rc $@ $(OBJS) 59 ar rc $@ $(OBJS)
60 $(RANLIB) $@ 60 $(RANLIB) $@
61 61
62pngtest: pngtest.o libpng.a 62pngtest: pngtest.o libpng.a
63 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 63 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
64 64
65test: pngtest 65test: pngtest
66 ./pngtest 66 ./pngtest
67 67
68install: libpng.a png.h pngconf.h pnglibconf.h 68install: libpng.a png.h pngconf.h pnglibconf.h
69 -@mkdir $(DESTDIR)$(INCPATH) 69 -@mkdir $(DESTDIR)$(INCPATH)
70 -@mkdir $(DESTDIR)$(INCPATH)/libpng 70 -@mkdir $(DESTDIR)$(INCPATH)/libpng
71 -@mkdir $(DESTDIR)$(LIBPATH) 71 -@mkdir $(DESTDIR)$(LIBPATH)
72 -@rm -f $(DESTDIR)$(INCPATH)/png.h 72 -@rm -f $(DESTDIR)$(INCPATH)/png.h
73 -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h 73 -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
74 cp png.h $(DESTDIR)$(INCPATH)/libpng 74 cp png.h $(DESTDIR)$(INCPATH)/libpng
75 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng 75 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
76 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng 76 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
77 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h 77 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
78 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h 78 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
79 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h 79 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
80 (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .) 80 (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
81 cp libpng.a $(DESTDIR)$(LIBPATH) 81 cp libpng.a $(DESTDIR)$(LIBPATH)
82 chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a 82 chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
83 83
84clean: 84clean:
85 rm -f *.o libpng.a pngtest pngout.png ansi2knr pnglibconf.h 85 rm -f *.o libpng.a pngtest pngout.png ansi2knr pnglibconf.h
86 86
87DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 87DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
88writelock: 88writelock:
89 chmod a-w *.[ch35] $(DOCS) scripts/* 89 chmod a-w *.[ch35] $(DOCS) scripts/*
90 90
91# DO NOT DELETE THIS LINE -- make depend depends on it. 91# DO NOT DELETE THIS LINE -- make depend depends on it.
92 92
93png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 93png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
94pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 94pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
95pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 95pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
96pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 96pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
97pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 97pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
98pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 98pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
99pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 99pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
100pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 100pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
101pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 101pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
102pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 102pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
103pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 103pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
104pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 104pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
105pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 105pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
106pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 106pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
107pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 107pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
108 108
109pngtest.o: png.h pngconf.h pnglibconf.h 109pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.linux b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.linux
index 95680f6..2dd9a93 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.linux
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.linux
@@ -1,239 +1,239 @@
1# makefile for libpng.a and libpng15.so on Linux ELF with gcc 1# makefile for libpng.a and libpng15.so on Linux ELF with gcc
2# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs and 2# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs and
3# Glenn Randers-Pehrson 3# Glenn Randers-Pehrson
4# Copyright (C) 1996, 1997 Andreas Dilger 4# Copyright (C) 1996, 1997 Andreas Dilger
5# 5#
6# This code is released under the libpng license. 6# This code is released under the libpng license.
7# For conditions of distribution and use, see the disclaimer 7# For conditions of distribution and use, see the disclaimer
8# and license in png.h 8# and license in png.h
9 9
10# Library name: 10# Library name:
11LIBNAME = libpng15 11LIBNAME = libpng15
12PNGMAJ = 15 12PNGMAJ = 15
13RELEASE = 9 13RELEASE = 9
14 14
15# Shared library names: 15# Shared library names:
16LIBSO=$(LIBNAME).so 16LIBSO=$(LIBNAME).so
17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
18LIBSOREL=$(LIBSOMAJ).$(RELEASE) 18LIBSOREL=$(LIBSOMAJ).$(RELEASE)
19OLDSO=libpng.so 19OLDSO=libpng.so
20 20
21# Utilities: 21# Utilities:
22AR_RC=ar rc 22AR_RC=ar rc
23CC=gcc 23CC=gcc
24MKDIR_P=mkdir -p 24MKDIR_P=mkdir -p
25LN_SF=ln -sf 25LN_SF=ln -sf
26RANLIB=ranlib 26RANLIB=ranlib
27RM_F=/bin/rm -f 27RM_F=/bin/rm -f
28 28
29# where "make install" puts libpng15.a, libpng15.so*, 29# where "make install" puts libpng15.a, libpng15.so*,
30# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h 30# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h
31# Prefix must be a full pathname. 31# Prefix must be a full pathname.
32prefix=/usr/local 32prefix=/usr/local
33exec_prefix=$(prefix) 33exec_prefix=$(prefix)
34 34
35# Where the zlib library and include files are located. 35# Where the zlib library and include files are located.
36#ZLIBLIB=/usr/local/lib 36#ZLIBLIB=/usr/local/lib
37#ZLIBINC=/usr/local/include 37#ZLIBINC=/usr/local/include
38ZLIBLIB=../zlib 38ZLIBLIB=../zlib
39ZLIBINC=../zlib 39ZLIBINC=../zlib
40 40
41ALIGN= 41ALIGN=
42# for i386: 42# for i386:
43#ALIGN=-malign-loops=2 -malign-functions=2 43#ALIGN=-malign-loops=2 -malign-functions=2
44 44
45WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 45WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
46 -Wmissing-declarations -Wtraditional -Wcast-align \ 46 -Wmissing-declarations -Wtraditional -Wcast-align \
47 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 47 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
48 48
49# for pgcc version 2.95.1, -O3 is buggy; don't use it. 49# for pgcc version 2.95.1, -O3 is buggy; don't use it.
50 50
51CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ 51CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \
52 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 52 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
53 53
54LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm 54LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm
55LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm 55LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
56 56
57INCPATH=$(prefix)/include 57INCPATH=$(prefix)/include
58LIBPATH=$(exec_prefix)/lib 58LIBPATH=$(exec_prefix)/lib
59MANPATH=$(prefix)/man 59MANPATH=$(prefix)/man
60BINPATH=$(exec_prefix)/bin 60BINPATH=$(exec_prefix)/bin
61 61
62# override DESTDIR= on the make install command line to easily support 62# override DESTDIR= on the make install command line to easily support
63# installing into a temporary location. Example: 63# installing into a temporary location. Example:
64# 64#
65# make install DESTDIR=/tmp/build/libpng 65# make install DESTDIR=/tmp/build/libpng
66# 66#
67# If you're going to install into a temporary location 67# If you're going to install into a temporary location
68# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 68# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
69# you execute make install. 69# you execute make install.
70DESTDIR= 70DESTDIR=
71 71
72DB=$(DESTDIR)$(BINPATH) 72DB=$(DESTDIR)$(BINPATH)
73DI=$(DESTDIR)$(INCPATH) 73DI=$(DESTDIR)$(INCPATH)
74DL=$(DESTDIR)$(LIBPATH) 74DL=$(DESTDIR)$(LIBPATH)
75DM=$(DESTDIR)$(MANPATH) 75DM=$(DESTDIR)$(MANPATH)
76 76
77OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 77OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
78 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 78 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
79 pngwtran.o pngmem.o pngerror.o pngpread.o 79 pngwtran.o pngmem.o pngerror.o pngpread.o
80 80
81OBJSDLL = $(OBJS:.o=.pic.o) 81OBJSDLL = $(OBJS:.o=.pic.o)
82 82
83.SUFFIXES: .c .o .pic.o 83.SUFFIXES: .c .o .pic.o
84 84
85.c.pic.o: 85.c.pic.o:
86 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c 86 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
87 87
88all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config 88all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
89 89
90# see scripts/pnglibconf.mak for more options 90# see scripts/pnglibconf.mak for more options
91pnglibconf.h: scripts/pnglibconf.h.prebuilt 91pnglibconf.h: scripts/pnglibconf.h.prebuilt
92 cp scripts/pnglibconf.h.prebuilt $@ 92 cp scripts/pnglibconf.h.prebuilt $@
93 93
94libpng.a: $(OBJS) 94libpng.a: $(OBJS)
95 $(AR_RC) $@ $(OBJS) 95 $(AR_RC) $@ $(OBJS)
96 $(RANLIB) $@ 96 $(RANLIB) $@
97 97
98libpng.pc: 98libpng.pc:
99 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 99 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
100 -e s!@exec_prefix@!$(exec_prefix)! \ 100 -e s!@exec_prefix@!$(exec_prefix)! \
101 -e s!@libdir@!$(LIBPATH)! \ 101 -e s!@libdir@!$(LIBPATH)! \
102 -e s!@includedir@!$(INCPATH)! \ 102 -e s!@includedir@!$(INCPATH)! \
103 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 103 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
104 104
105libpng-config: 105libpng-config:
106 ( cat scripts/libpng-config-head.in; \ 106 ( cat scripts/libpng-config-head.in; \
107 echo prefix=\"$(prefix)\"; \ 107 echo prefix=\"$(prefix)\"; \
108 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 108 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
109 echo L_opts=\"-L$(LIBPATH)\"; \ 109 echo L_opts=\"-L$(LIBPATH)\"; \
110 echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ 110 echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
111 echo libs=\"-lpng15 -lz -lm\"; \ 111 echo libs=\"-lpng15 -lz -lm\"; \
112 cat scripts/libpng-config-body.in ) > libpng-config 112 cat scripts/libpng-config-body.in ) > libpng-config
113 chmod +x libpng-config 113 chmod +x libpng-config
114 114
115$(LIBSO): $(LIBSOMAJ) 115$(LIBSO): $(LIBSOMAJ)
116 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 116 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
117 117
118$(LIBSOMAJ): $(OBJSDLL) 118$(LIBSOMAJ): $(OBJSDLL)
119 $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL) 119 $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
120 120
121pngtest: pngtest.o $(LIBSO) 121pngtest: pngtest.o $(LIBSO)
122 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 122 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
123 123
124pngtest-static: pngtest.o libpng.a 124pngtest-static: pngtest.o libpng.a
125 $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A) 125 $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)
126 126
127test: pngtest pngtest-static 127test: pngtest pngtest-static
128 @echo "" 128 @echo ""
129 @echo " Running pngtest dynamically linked with $(LIBSO):" 129 @echo " Running pngtest dynamically linked with $(LIBSO):"
130 @echo "" 130 @echo ""
131 ./pngtest 131 ./pngtest
132 @echo "" 132 @echo ""
133 @echo " Running pngtest statically linked with libpng.a:" 133 @echo " Running pngtest statically linked with libpng.a:"
134 @echo "" 134 @echo ""
135 ./pngtest-static 135 ./pngtest-static
136 136
137install-headers: png.h pngconf.h pnglibconf.h 137install-headers: png.h pngconf.h pnglibconf.h
138 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 138 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
139 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 139 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
140 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 140 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
141 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 141 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
142 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 142 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
143 -@$(RM_F) $(DI)/libpng 143 -@$(RM_F) $(DI)/libpng
144 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 144 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
145 145
146install-static: install-headers libpng.a 146install-static: install-headers libpng.a
147 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 147 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
148 cp libpng.a $(DL)/$(LIBNAME).a 148 cp libpng.a $(DL)/$(LIBNAME).a
149 chmod 644 $(DL)/$(LIBNAME).a 149 chmod 644 $(DL)/$(LIBNAME).a
150 -@$(RM_F) $(DL)/libpng.a 150 -@$(RM_F) $(DL)/libpng.a
151 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 151 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
152 152
153install-shared: install-headers $(LIBSOMAJ) libpng.pc 153install-shared: install-headers $(LIBSOMAJ) libpng.pc
154 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 154 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
155 -@$(RM_F) $(DL)/$(LIBSO) 155 -@$(RM_F) $(DL)/$(LIBSO)
156 -@$(RM_F) $(DL)/$(LIBSOREL) 156 -@$(RM_F) $(DL)/$(LIBSOREL)
157 -@$(RM_F) $(DL)/$(OLDSO) 157 -@$(RM_F) $(DL)/$(OLDSO)
158 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 158 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
159 chmod 755 $(DL)/$(LIBSOREL) 159 chmod 755 $(DL)/$(LIBSOREL)
160 (cd $(DL); \ 160 (cd $(DL); \
161 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 161 $(LN_SF) $(LIBSOREL) $(LIBSO); \
162 $(LN_SF) $(LIBSO) $(OLDSO)) 162 $(LN_SF) $(LIBSO) $(OLDSO))
163 163
164 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 164 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
165 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 165 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
166 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 166 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
167 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 167 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
168 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 168 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
169 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 169 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
170 170
171install-man: libpng.3 libpngpf.3 png.5 171install-man: libpng.3 libpngpf.3 png.5
172 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 172 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
173 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 173 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
174 -@$(RM_F) $(DM)/man3/libpng.3 174 -@$(RM_F) $(DM)/man3/libpng.3
175 -@$(RM_F) $(DM)/man3/libpngpf.3 175 -@$(RM_F) $(DM)/man3/libpngpf.3
176 cp libpng.3 $(DM)/man3 176 cp libpng.3 $(DM)/man3
177 cp libpngpf.3 $(DM)/man3 177 cp libpngpf.3 $(DM)/man3
178 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 178 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
179 -@$(RM_F) $(DM)/man5/png.5 179 -@$(RM_F) $(DM)/man5/png.5
180 cp png.5 $(DM)/man5 180 cp png.5 $(DM)/man5
181 181
182install-config: libpng-config 182install-config: libpng-config
183 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 183 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
184 -@$(RM_F) $(DB)/libpng-config 184 -@$(RM_F) $(DB)/libpng-config
185 -@$(RM_F) $(DB)/$(LIBNAME)-config 185 -@$(RM_F) $(DB)/$(LIBNAME)-config
186 cp libpng-config $(DB)/$(LIBNAME)-config 186 cp libpng-config $(DB)/$(LIBNAME)-config
187 chmod 755 $(DB)/$(LIBNAME)-config 187 chmod 755 $(DB)/$(LIBNAME)-config
188 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 188 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
189 189
190install: install-static install-shared install-man install-config 190install: install-static install-shared install-man install-config
191 191
192# If you installed in $(DESTDIR), test-installed won't work until you 192# If you installed in $(DESTDIR), test-installed won't work until you
193# move the library to its final location. Use test-dd to test it 193# move the library to its final location. Use test-dd to test it
194# before then. 194# before then.
195 195
196test-dd: 196test-dd:
197 echo 197 echo
198 echo Testing installed dynamic shared library in $(DL). 198 echo Testing installed dynamic shared library in $(DL).
199 $(CC) -I$(DI) -I$(ZLIBINC) \ 199 $(CC) -I$(DI) -I$(ZLIBINC) \
200 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 200 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
201 -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ 201 -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
202 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 202 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
203 ./pngtestd pngtest.png 203 ./pngtestd pngtest.png
204 204
205test-installed: 205test-installed:
206 $(CC) -I$(ZLIBINC) \ 206 $(CC) -I$(ZLIBINC) \
207 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 207 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
208 -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ 208 -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
209 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 209 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
210 ./pngtesti pngtest.png 210 ./pngtesti pngtest.png
211 211
212clean: 212clean:
213 $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ 213 $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
214 $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \ 214 $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
215 libpng.pc pnglibconf.h 215 libpng.pc pnglibconf.h
216 216
217DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 217DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
218writelock: 218writelock:
219 chmod a-w *.[ch35] $(DOCS) scripts/* 219 chmod a-w *.[ch35] $(DOCS) scripts/*
220 220
221# DO NOT DELETE THIS LINE -- make depend depends on it. 221# DO NOT DELETE THIS LINE -- make depend depends on it.
222 222
223png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 223png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
224pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 224pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
225pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 227pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
228pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 228pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
229pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 229pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
230pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 230pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
231pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 231pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
232pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 232pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
233pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 233pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
234pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 234pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
235pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 235pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
236pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 236pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
237pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 237pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
238 238
239pngtest.o: png.h pngconf.h 239pngtest.o: png.h pngconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.mips b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.mips
index bd254fc..179d385 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.mips
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.mips
@@ -1,94 +1,94 @@
1# makefile for libpng 1# makefile for libpng
2# Copyright (C) Glenn Randers-Pehrson 2# Copyright (C) Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# where make install puts libpng.a and png.h 9# where make install puts libpng.a and png.h
10prefix=/usr/local 10prefix=/usr/local
11INCPATH=$(prefix)/include 11INCPATH=$(prefix)/include
12LIBPATH=$(prefix)/lib 12LIBPATH=$(prefix)/lib
13 13
14# override DESTDIR= on the make install command line to easily support 14# override DESTDIR= on the make install command line to easily support
15# installing into a temporary location. Example: 15# installing into a temporary location. Example:
16# 16#
17# make install DESTDIR=/tmp/build/libpng 17# make install DESTDIR=/tmp/build/libpng
18# 18#
19# If you're going to install into a temporary location 19# If you're going to install into a temporary location
20# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 20# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
21# you execute make install. 21# you execute make install.
22DESTDIR= 22DESTDIR=
23 23
24CC=cc 24CC=cc
25CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips 25CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips
26#CFLAGS=-O 26#CFLAGS=-O
27LDFLAGS=-L. -L../zlib/ -lpng -lz -lm 27LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
28 28
29#RANLIB=ranlib 29#RANLIB=ranlib
30RANLIB=echo 30RANLIB=echo
31 31
32OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 32OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
33 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 33 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
34 pngwtran.o pngmem.o pngerror.o pngpread.o 34 pngwtran.o pngmem.o pngerror.o pngpread.o
35 35
36all: libpng.a pngtest 36all: libpng.a pngtest
37 37
38# see scripts/pnglibconf.mak for more options 38# see scripts/pnglibconf.mak for more options
39pnglibconf.h: scripts/pnglibconf.h.prebuilt 39pnglibconf.h: scripts/pnglibconf.h.prebuilt
40 cp scripts/pnglibconf.h.prebuilt $@ 40 cp scripts/pnglibconf.h.prebuilt $@
41 41
42libpng.a: $(OBJS) 42libpng.a: $(OBJS)
43 ar rc $@ $(OBJS) 43 ar rc $@ $(OBJS)
44 $(RANLIB) $@ 44 $(RANLIB) $@
45 45
46pngtest: pngtest.o libpng.a 46pngtest: pngtest.o libpng.a
47 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 47 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
48 48
49test: pngtest 49test: pngtest
50 ./pngtest 50 ./pngtest
51 51
52install: libpng.a 52install: libpng.a
53 -@mkdir $(DESTDIR)$(INCPATH) 53 -@mkdir $(DESTDIR)$(INCPATH)
54 -@mkdir $(DESTDIR)$(INCPATH)/libpng 54 -@mkdir $(DESTDIR)$(INCPATH)/libpng
55 -@mkdir $(DESTDIR)$(LIBPATH) 55 -@mkdir $(DESTDIR)$(LIBPATH)
56 -@rm -f $(DESTDIR)$(INCPATH)/png.h 56 -@rm -f $(DESTDIR)$(INCPATH)/png.h
57 -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h 57 -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
58 -@rm -f $(DESTDIR)$(INCPATH)/pnglibconf.h 58 -@rm -f $(DESTDIR)$(INCPATH)/pnglibconf.h
59 cp png.h $(DESTDIR)$(INCPATH)/libpng 59 cp png.h $(DESTDIR)$(INCPATH)/libpng
60 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng 60 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
61 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng 61 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
62 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h 62 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
63 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h 63 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
64 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h 64 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
65 (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .) 65 (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
66 cp libpng.a $(DESTDIR)$(LIBPATH) 66 cp libpng.a $(DESTDIR)$(LIBPATH)
67 chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a 67 chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
68 68
69clean: 69clean:
70 rm -f *.o libpng.a pngtest pngout.png pnglibconf.h 70 rm -f *.o libpng.a pngtest pngout.png pnglibconf.h
71 71
72DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 72DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
73writelock: 73writelock:
74 chmod a-w *.[ch35] $(DOCS) scripts/* 74 chmod a-w *.[ch35] $(DOCS) scripts/*
75 75
76# DO NOT DELETE THIS LINE -- make depend depends on it. 76# DO NOT DELETE THIS LINE -- make depend depends on it.
77 77
78png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 78png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
79pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 79pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
80pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 80pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
81pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 81pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
82pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 82pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
83pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 83pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
84pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 84pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
85pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 85pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
86pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 86pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
87pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 87pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
88pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 88pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
89pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 89pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
90pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 90pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
91pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 91pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
92pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 92pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
93 93
94pngtest.o: png.h pngconf.h pnglibconf.h 94pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.msc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.msc
index 25adbb4..baa863d 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.msc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.msc
@@ -1,95 +1,95 @@
1# makefile for libpng 1# makefile for libpng
2# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 2# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
3# Copyright (C) 2006, 2009 Glenn Randers-Pehrson 3# Copyright (C) 2006, 2009 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# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib 9# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
10 10
11# -------- Microsoft C 5.1 and later, does not use assembler code -------- 11# -------- Microsoft C 5.1 and later, does not use assembler code --------
12MODEL=L 12MODEL=L
13CFLAGS=-Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib 13CFLAGS=-Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib
14#-Ox generates bad code with MSC 5.1 14#-Ox generates bad code with MSC 5.1
15CC=cl 15CC=cl
16LD=link 16LD=link
17LDFLAGS=/e/st:0x1500/noe 17LDFLAGS=/e/st:0x1500/noe
18O=.obj 18O=.obj
19 19
20#uncomment next to put error messages in a file 20#uncomment next to put error messages in a file
21ERRFILE= >> pngerrs 21ERRFILE= >> pngerrs
22 22
23# variables 23# variables
24OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) 24OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)
25OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) 25OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)
26OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) 26OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
27 27
28all: libpng.lib 28all: libpng.lib
29 29
30# see scripts/pnglibconf.mak for more options 30# see scripts/pnglibconf.mak for more options
31pnglibconf.h: scripts/pnglibconf.h.prebuilt 31pnglibconf.h: scripts/pnglibconf.h.prebuilt
32 cp scripts/pnglibconf.h.prebuilt $@ 32 cp scripts/pnglibconf.h.prebuilt $@
33 33
34png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 34png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
35 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 35 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
36 36
37pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 37pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
38 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 38 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
39 39
40pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 40pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
41 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 41 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
42 42
43pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 43pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
44 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 44 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
45 45
46pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 46pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
47 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 47 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
48 48
49pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 49pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
50 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 50 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
51 51
52pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 52pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
53 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 53 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
54 54
55pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 55pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
56 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 56 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
57 57
58pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 58pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
59 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 59 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
60 60
61pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 61pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
62 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 62 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
63 63
64pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 64pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
65 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 65 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
66 66
67pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 67pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
68 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 68 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
69 69
70pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 70pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
71 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 71 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
72 72
73pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 73pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
74 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 74 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
75 75
76pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 76pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
77 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 77 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
78 78
79libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3) 79libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3)
80 del libpng.lib 80 del libpng.lib
81 lib libpng $(OBJS1); 81 lib libpng $(OBJS1);
82 lib libpng $(OBJS2); 82 lib libpng $(OBJS2);
83 lib libpng $(OBJS3); 83 lib libpng $(OBJS3);
84 84
85pngtest$(O): png.h pngconf.h pnglibconf.h 85pngtest$(O): png.h pngconf.h pnglibconf.h
86 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 86 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
87 87
88pngtest.exe: pngtest.obj libpng.lib 88pngtest.exe: pngtest.obj libpng.lib
89 $(LD) $(LDFLAGS) pngtest.obj,,,libpng.lib ..\zlib\zlib.lib ; 89 $(LD) $(LDFLAGS) pngtest.obj,,,libpng.lib ..\zlib\zlib.lib ;
90 90
91test: pngtest.exe 91test: pngtest.exe
92 pngtest 92 pngtest
93 93
94# End of makefile for libpng 94# End of makefile for libpng
95 95
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ne12bsd b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ne12bsd
index 526284f..29b9924 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ne12bsd
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.ne12bsd
@@ -1,50 +1,50 @@
1# makefile for libpng for NetBSD for the standard 1# makefile for libpng for NetBSD for the standard
2# make obj && make depend && make && make test 2# make obj && make depend && make && make test
3# make includes && make install 3# make includes && make install
4# Copyright (C) 2002 Patrick R.L. Welche 4# Copyright (C) 2002 Patrick R.L. Welche
5# Copyright (C) 2007, 2009 Glenn Randers-Pehrson 5# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
6# 6#
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# You should also run makefile.netbsd 11# You should also run makefile.netbsd
12 12
13LOCALBASE?=/usr/local 13LOCALBASE?=/usr/local
14LIBDIR= ${LOCALBASE}/lib 14LIBDIR= ${LOCALBASE}/lib
15MANDIR= ${LOCALBASE}/man 15MANDIR= ${LOCALBASE}/man
16INCSDIR=${LOCALBASE}/include/libpng15 16INCSDIR=${LOCALBASE}/include/libpng15
17 17
18LIB= png15 18LIB= png15
19SHLIB_MAJOR= 0 19SHLIB_MAJOR= 0
20SHLIB_MINOR= 1.5.9 20SHLIB_MINOR= 1.5.9
21SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ 21SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
22 pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ 22 pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
23 pngwtran.c pngmem.c pngerror.c pngpread.c 23 pngwtran.c pngmem.c pngerror.c pngpread.c
24INCS= png.h pngconf.h pnglibconf.h 24INCS= png.h pngconf.h pnglibconf.h
25MAN= libpng.3 libpngpf.3 png.5 25MAN= libpng.3 libpngpf.3 png.5
26 26
27CPPFLAGS+=-I${.CURDIR} 27CPPFLAGS+=-I${.CURDIR}
28 28
29# We should be able to do something like this instead of the manual 29# We should be able to do something like this instead of the manual
30# uncommenting, but it core dumps for me at the moment: 30# uncommenting, but it core dumps for me at the moment:
31# .if ${MACHINE_ARCH} == "i386" 31# .if ${MACHINE_ARCH} == "i386"
32# MKLINT= no 32# MKLINT= no
33# .endif 33# .endif
34 34
35CLEANFILES+=pngtest.o pngtest pnglibconf.h 35CLEANFILES+=pngtest.o pngtest pnglibconf.h
36 36
37# see scripts/pnglibconf.mak for more options 37# see scripts/pnglibconf.mak for more options
38pnglibconf.h: scripts/pnglibconf.h.prebuilt 38pnglibconf.h: scripts/pnglibconf.h.prebuilt
39 cp scripts/pnglibconf.h.prebuilt $@ 39 cp scripts/pnglibconf.h.prebuilt $@
40 40
41pngtest.o: pngtest.c 41pngtest.o: pngtest.c
42 ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} 42 ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
43 43
44pngtest: pngtest.o libpng.a 44pngtest: pngtest.o libpng.a
45 ${CC} ${LDFLAGS} ${.ALLSRC} -o${.TARGET} -lz -lm 45 ${CC} ${LDFLAGS} ${.ALLSRC} -o${.TARGET} -lz -lm
46 46
47test: pngtest 47test: pngtest
48 cd ${.CURDIR} && ${.OBJDIR}/pngtest 48 cd ${.CURDIR} && ${.OBJDIR}/pngtest
49 49
50.include <bsd.lib.mk> 50.include <bsd.lib.mk>
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.netbsd b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.netbsd
index 5dec277..43b4bda 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.netbsd
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.netbsd
@@ -1,50 +1,50 @@
1# makefile for libpng for NetBSD for the standard 1# makefile for libpng for NetBSD for the standard
2# make obj && make depend && make && make test 2# make obj && make depend && make && make test
3# make includes && make install 3# make includes && make install
4# Copyright (C) 2002 Patrick R.L. Welche 4# Copyright (C) 2002 Patrick R.L. Welche
5# Copyright (C) 2007-2009 Glenn Randers-Pehrson 5# Copyright (C) 2007-2009 Glenn Randers-Pehrson
6# 6#
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# You should also run makefile.ne15bsd 11# You should also run makefile.ne15bsd
12 12
13LOCALBASE?=/usr/local 13LOCALBASE?=/usr/local
14LIBDIR= ${LOCALBASE}/lib 14LIBDIR= ${LOCALBASE}/lib
15MANDIR= ${LOCALBASE}/man 15MANDIR= ${LOCALBASE}/man
16INCSDIR=${LOCALBASE}/include 16INCSDIR=${LOCALBASE}/include
17 17
18LIB= png 18LIB= png
19SHLIB_MAJOR= 15 19SHLIB_MAJOR= 15
20SHLIB_MINOR= 1.5.9 20SHLIB_MINOR= 1.5.9
21SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ 21SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
22 pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ 22 pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
23 pngwtran.c pngmem.c pngerror.c pngpread.c 23 pngwtran.c pngmem.c pngerror.c pngpread.c
24INCS= png.h pngconf.h pnglibconf.h 24INCS= png.h pngconf.h pnglibconf.h
25MAN= libpng.3 libpngpf.3 png.5 25MAN= libpng.3 libpngpf.3 png.5
26 26
27CPPFLAGS+=-I${.CURDIR} 27CPPFLAGS+=-I${.CURDIR}
28 28
29# We should be able to do something like this instead of the manual 29# We should be able to do something like this instead of the manual
30# uncommenting, but it core dumps for me at the moment: 30# uncommenting, but it core dumps for me at the moment:
31# .if ${MACHINE_ARCH} == "i386" 31# .if ${MACHINE_ARCH} == "i386"
32# MKLINT= no 32# MKLINT= no
33# .endif 33# .endif
34 34
35CLEANFILES+=pngtest.o pngtest pnglibconf.h 35CLEANFILES+=pngtest.o pngtest pnglibconf.h
36 36
37# see scripts/pnglibconf.mak for more options 37# see scripts/pnglibconf.mak for more options
38pnglibconf.h: scripts/pnglibconf.h.prebuilt 38pnglibconf.h: scripts/pnglibconf.h.prebuilt
39 cp scripts/pnglibconf.h.prebuilt $@ 39 cp scripts/pnglibconf.h.prebuilt $@
40 40
41pngtest.o: pngtest.c 41pngtest.o: pngtest.c
42 ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} 42 ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
43 43
44pngtest: pngtest.o libpng.a 44pngtest: pngtest.o libpng.a
45 ${CC} ${LDFLAGS} ${.ALLSRC} -o${.TARGET} -lz -lm 45 ${CC} ${LDFLAGS} ${.ALLSRC} -o${.TARGET} -lz -lm
46 46
47test: pngtest 47test: pngtest
48 cd ${.CURDIR} && ${.OBJDIR}/pngtest 48 cd ${.CURDIR} && ${.OBJDIR}/pngtest
49 49
50.include <bsd.lib.mk> 50.include <bsd.lib.mk>
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.openbsd b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.openbsd
index c4e7e07..3bb660b 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.openbsd
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.openbsd
@@ -1,82 +1,82 @@
1# makefile for libpng 1# makefile for libpng
2# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 2# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
3# Copyright (C) 2007-2009 Glenn Randers-Pehrson 3# Copyright (C) 2007-2009 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
9PREFIX?= /usr/local 9PREFIX?= /usr/local
10LIBDIR= ${PREFIX}/lib 10LIBDIR= ${PREFIX}/lib
11MANDIR= ${PREFIX}/man/cat 11MANDIR= ${PREFIX}/man/cat
12 12
13SHLIB_MAJOR= 15 13SHLIB_MAJOR= 15
14SHLIB_MINOR= 1.5.9 14SHLIB_MINOR= 1.5.9
15 15
16LIB= png 16LIB= png
17SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ 17SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
18 pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \ 18 pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
19 pngwio.c pngwrite.c pngwtran.c pngwutil.c 19 pngwio.c pngwrite.c pngwtran.c pngwutil.c
20 20
21HDRS= png.h pngconf.h pnglibconf.h 21HDRS= png.h pngconf.h pnglibconf.h
22 22
23CFLAGS+= -W -Wall 23CFLAGS+= -W -Wall
24CPPFLAGS+= -I${.CURDIR} 24CPPFLAGS+= -I${.CURDIR}
25 25
26NOPROFILE= Yes 26NOPROFILE= Yes
27 27
28CLEANFILES+= pngtest.o pngtest pnglibconf.h 28CLEANFILES+= pngtest.o pngtest pnglibconf.h
29 29
30MAN= libpng.3 libpngpf.3 png.5 30MAN= libpng.3 libpngpf.3 png.5
31DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \ 31DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \
32 libpng-manual.txt 32 libpng-manual.txt
33 33
34# see scripts/pnglibconf.mak for more options 34# see scripts/pnglibconf.mak for more options
35pnglibconf.h: scripts/pnglibconf.h.prebuilt 35pnglibconf.h: scripts/pnglibconf.h.prebuilt
36 cp scripts/pnglibconf.h.prebuilt $@ 36 cp scripts/pnglibconf.h.prebuilt $@
37 37
38pngtest.o: pngtest.c 38pngtest.o: pngtest.c
39 ${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET} 39 ${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
40 40
41pngtest: pngtest.o 41pngtest: pngtest.o
42 ${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm 42 ${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm
43 43
44test: pngtest 44test: pngtest
45 cd ${.OBJDIR} && env \ 45 cd ${.OBJDIR} && env \
46 LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest 46 LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
47 47
48beforeinstall: 48beforeinstall:
49 if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \ 49 if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
50 ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \ 50 ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \
51 fi 51 fi
52 if [ ! -d ${DESTDIR}${LIBDIR} ]; then \ 52 if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
53 ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \ 53 ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
54 fi 54 fi
55 if [ ! -d ${DESTDIR}${LIBDIR}/debug ]; then \ 55 if [ ! -d ${DESTDIR}${LIBDIR}/debug ]; then \
56 ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}/debug; \ 56 ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}/debug; \
57 fi 57 fi
58 if [ ! -d ${DESTDIR}${MANDIR}3 ]; then \ 58 if [ ! -d ${DESTDIR}${MANDIR}3 ]; then \
59 ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}3; \ 59 ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}3; \
60 fi 60 fi
61 if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \ 61 if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
62 ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \ 62 ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
63 fi 63 fi
64 if [ ! -d ${DESTDIR}${PREFIX}/share/doc/png ]; then \ 64 if [ ! -d ${DESTDIR}${PREFIX}/share/doc/png ]; then \
65 ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/share/doc/png; \ 65 ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/share/doc/png; \
66 fi 66 fi
67 67
68afterinstall: 68afterinstall:
69 @rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a 69 @rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a
70 @rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a 70 @rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a
71 @rm -f ${DESTDIR}${PREFIX}/include/png.h 71 @rm -f ${DESTDIR}${PREFIX}/include/png.h
72 @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h 72 @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
73 @rm -f ${DESTDIR}${PREFIX}/include/pnglibconf.h 73 @rm -f ${DESTDIR}${PREFIX}/include/pnglibconf.h
74 @rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true 74 @rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
75 ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ 75 ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
76 -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include 76 -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
77 ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ 77 ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
78 -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include 78 -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
79 ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ 79 ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
80 -m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png 80 -m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
81 81
82.include <bsd.lib.mk> 82.include <bsd.lib.mk>
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sco b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sco
index 9841e89..0aad789 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sco
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sco
@@ -1,218 +1,218 @@
1# makefile for SCO OSr5 ELF and Unixware 7 with Native cc 1# makefile for SCO OSr5 ELF and Unixware 7 with Native cc
2# Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx 2# Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx
3# force ELF build dynamic linking, SONAME setting in lib and RPATH in app 3# force ELF build dynamic linking, SONAME setting in lib and RPATH in app
4# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson 4# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
5# Copyright (C) 1998 Greg Roelofs 5# Copyright (C) 1998 Greg Roelofs
6# Copyright (C) 1996, 1997 Andreas Dilger 6# Copyright (C) 1996, 1997 Andreas Dilger
7# 7#
8# This code is released under the libpng license. 8# This code is released under the libpng license.
9# For conditions of distribution and use, see the disclaimer 9# For conditions of distribution and use, see the disclaimer
10# and license in png.h 10# and license in png.h
11 11
12# Library name: 12# Library name:
13LIBNAME = libpng15 13LIBNAME = libpng15
14PNGMAJ = 15 14PNGMAJ = 15
15 15
16# Shared library names: 16# Shared library names:
17LIBSO=$(LIBNAME).so 17LIBSO=$(LIBNAME).so
18LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 18LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
19LIBSOREL=$(LIBSOMAJ).$(RELEASE) 19LIBSOREL=$(LIBSOMAJ).$(RELEASE)
20OLDSO=libpng.so 20OLDSO=libpng.so
21 21
22# Utilities: 22# Utilities:
23CC=cc 23CC=cc
24AR_RC=ar rc 24AR_RC=ar rc
25MKDIR_P=mkdir 25MKDIR_P=mkdir
26LN_SF=ln -f -s 26LN_SF=ln -f -s
27RANLIB=echo 27RANLIB=echo
28RM_F=/bin/rm -f 28RM_F=/bin/rm -f
29 29
30# where make install puts libpng.a, $(OLDSO)*, and png.h 30# where make install puts libpng.a, $(OLDSO)*, and png.h
31prefix=/usr/local 31prefix=/usr/local
32exec_prefix=$(prefix) 32exec_prefix=$(prefix)
33 33
34# Where the zlib library and include files are located 34# Where the zlib library and include files are located
35#ZLIBLIB=/usr/local/lib 35#ZLIBLIB=/usr/local/lib
36#ZLIBINC=/usr/local/include 36#ZLIBINC=/usr/local/include
37ZLIBLIB=../zlib 37ZLIBLIB=../zlib
38ZLIBINC=../zlib 38ZLIBINC=../zlib
39 39
40CFLAGS= -dy -belf -I$(ZLIBINC) -O3 40CFLAGS= -dy -belf -I$(ZLIBINC) -O3
41LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm 41LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm
42 42
43INCPATH=$(prefix)/include 43INCPATH=$(prefix)/include
44LIBPATH=$(exec_prefix)/lib 44LIBPATH=$(exec_prefix)/lib
45MANPATH=$(prefix)/man 45MANPATH=$(prefix)/man
46BINPATH=$(exec_prefix)/bin 46BINPATH=$(exec_prefix)/bin
47 47
48# override DESTDIR= on the make install command line to easily support 48# override DESTDIR= on the make install command line to easily support
49# installing into a temporary location. Example: 49# installing into a temporary location. Example:
50# 50#
51# make install DESTDIR=/tmp/build/libpng 51# make install DESTDIR=/tmp/build/libpng
52# 52#
53# If you're going to install into a temporary location 53# If you're going to install into a temporary location
54# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 54# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
55# you execute make install. 55# you execute make install.
56DESTDIR= 56DESTDIR=
57 57
58DB=$(DESTDIR)$(BINPATH) 58DB=$(DESTDIR)$(BINPATH)
59DI=$(DESTDIR)$(INCPATH) 59DI=$(DESTDIR)$(INCPATH)
60DL=$(DESTDIR)$(LIBPATH) 60DL=$(DESTDIR)$(LIBPATH)
61DM=$(DESTDIR)$(MANPATH) 61DM=$(DESTDIR)$(MANPATH)
62 62
63OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 63OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
64 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 64 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
65 pngwtran.o pngmem.o pngerror.o pngpread.o 65 pngwtran.o pngmem.o pngerror.o pngpread.o
66 66
67OBJSDLL = $(OBJS:.o=.pic.o) 67OBJSDLL = $(OBJS:.o=.pic.o)
68 68
69.SUFFIXES: .c .o .pic.o 69.SUFFIXES: .c .o .pic.o
70 70
71.c.pic.o: 71.c.pic.o:
72 $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c 72 $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
73 73
74all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 74all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
75 75
76# see scripts/pnglibconf.mak for more options 76# see scripts/pnglibconf.mak for more options
77pnglibconf.h: scripts/pnglibconf.h.prebuilt 77pnglibconf.h: scripts/pnglibconf.h.prebuilt
78 cp scripts/pnglibconf.h.prebuilt $@ 78 cp scripts/pnglibconf.h.prebuilt $@
79 79
80libpng.a: $(OBJS) 80libpng.a: $(OBJS)
81 $(AR_RC) $@ $(OBJS) 81 $(AR_RC) $@ $(OBJS)
82 $(RANLIB) $@ 82 $(RANLIB) $@
83 83
84libpng.pc: 84libpng.pc:
85 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 85 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
86 -e s!@exec_prefix@!$(exec_prefix)! \ 86 -e s!@exec_prefix@!$(exec_prefix)! \
87 -e s!@libdir@!$(LIBPATH)! \ 87 -e s!@libdir@!$(LIBPATH)! \
88 -e s!@includedir@!$(INCPATH)! \ 88 -e s!@includedir@!$(INCPATH)! \
89 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 89 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
90 90
91libpng-config: 91libpng-config:
92 ( cat scripts/libpng-config-head.in; \ 92 ( cat scripts/libpng-config-head.in; \
93 echo prefix=\"$(prefix)\"; \ 93 echo prefix=\"$(prefix)\"; \
94 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 94 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
95 echo ccopts=\"-belf\"; \ 95 echo ccopts=\"-belf\"; \
96 echo L_opts=\"-L$(LIBPATH)\"; \ 96 echo L_opts=\"-L$(LIBPATH)\"; \
97 echo libs=\"-lpng15 -lz -lm\"; \ 97 echo libs=\"-lpng15 -lz -lm\"; \
98 cat scripts/libpng-config-body.in ) > libpng-config 98 cat scripts/libpng-config-body.in ) > libpng-config
99 chmod +x libpng-config 99 chmod +x libpng-config
100 100
101$(LIBSO): $(LIBSOMAJ) 101$(LIBSO): $(LIBSOMAJ)
102 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 102 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
103 103
104$(LIBSOMAJ): $(OBJSDLL) 104$(LIBSOMAJ): $(OBJSDLL)
105 $(CC) -G -Wl,-h,$(LIBSOMAJ) -o $(LIBSOMAJ) \ 105 $(CC) -G -Wl,-h,$(LIBSOMAJ) -o $(LIBSOMAJ) \
106 $(OBJSDLL) 106 $(OBJSDLL)
107 107
108pngtest: pngtest.o $(LIBSO) 108pngtest: pngtest.o $(LIBSO)
109 LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 109 LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
110 110
111test: pngtest 111test: pngtest
112 ./pngtest 112 ./pngtest
113 113
114install-headers: png.h pngconf.h pnglibconf.h 114install-headers: png.h pngconf.h pnglibconf.h
115 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 115 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
116 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 116 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
117 -@$(RM_F) $(DI)/png.h 117 -@$(RM_F) $(DI)/png.h
118 -@$(RM_F) $(DI)/pngconf.h 118 -@$(RM_F) $(DI)/pngconf.h
119 -@$(RM_F) $(DI)/pnglibconf.h 119 -@$(RM_F) $(DI)/pnglibconf.h
120 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 120 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
121 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 121 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
122 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 122 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
123 -@$(RM_F) $(DI)/libpng 123 -@$(RM_F) $(DI)/libpng
124 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 124 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
125 125
126install-static: install-headers libpng.a 126install-static: install-headers libpng.a
127 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 127 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
128 cp libpng.a $(DL)/$(LIBNAME).a 128 cp libpng.a $(DL)/$(LIBNAME).a
129 chmod 644 $(DL)/$(LIBNAME).a 129 chmod 644 $(DL)/$(LIBNAME).a
130 -@$(RM_F) $(DL)/libpng.a 130 -@$(RM_F) $(DL)/libpng.a
131 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 131 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
132 132
133install-shared: install-headers $(LIBSOMAJ) libpng.pc 133install-shared: install-headers $(LIBSOMAJ) libpng.pc
134 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 134 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
135 -@$(RM_F) $(DL)/$(LIBSO) 135 -@$(RM_F) $(DL)/$(LIBSO)
136 -@$(RM_F) $(DL)/$(LIBSOREL) 136 -@$(RM_F) $(DL)/$(LIBSOREL)
137 -@$(RM_F) $(DL)/$(OLDSO) 137 -@$(RM_F) $(DL)/$(OLDSO)
138 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 138 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
139 chmod 755 $(DL)/$(LIBSOREL) 139 chmod 755 $(DL)/$(LIBSOREL)
140 (cd $(DL); \ 140 (cd $(DL); \
141 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 141 $(LN_SF) $(LIBSOREL) $(LIBSO); \
142 $(LN_SF) $(LIBSO) $(OLDSO)) 142 $(LN_SF) $(LIBSO) $(OLDSO))
143 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 143 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
144 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 144 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
145 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 145 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
146 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 146 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
147 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 147 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
148 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 148 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
149 149
150install-man: libpng.3 libpngpf.3 png.5 150install-man: libpng.3 libpngpf.3 png.5
151 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 151 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
152 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 152 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
153 -@$(RM_F) $(DM)/man3/libpng.3 153 -@$(RM_F) $(DM)/man3/libpng.3
154 -@$(RM_F) $(DM)/man3/libpngpf.3 154 -@$(RM_F) $(DM)/man3/libpngpf.3
155 cp libpng.3 $(DM)/man3 155 cp libpng.3 $(DM)/man3
156 cp libpngpf.3 $(DM)/man3 156 cp libpngpf.3 $(DM)/man3
157 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 157 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
158 -@$(RM_F) $(DM)/man5/png.5 158 -@$(RM_F) $(DM)/man5/png.5
159 cp png.5 $(DM)/man5 159 cp png.5 $(DM)/man5
160 160
161install-config: libpng-config 161install-config: libpng-config
162 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 162 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
163 -@$(RM_F) $(DB)/libpng-config 163 -@$(RM_F) $(DB)/libpng-config
164 -@$(RM_F) $(DB)/$(LIBNAME)-config 164 -@$(RM_F) $(DB)/$(LIBNAME)-config
165 cp libpng-config $(DB)/$(LIBNAME)-config 165 cp libpng-config $(DB)/$(LIBNAME)-config
166 chmod 755 $(DB)/$(LIBNAME)-config 166 chmod 755 $(DB)/$(LIBNAME)-config
167 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 167 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
168 168
169install: install-static install-shared install-man install-config 169install: install-static install-shared install-man install-config
170 170
171# If you installed in $(DESTDIR), test-installed won't work until you 171# If you installed in $(DESTDIR), test-installed won't work until you
172# move the library to its final location. Use test-dd to test it 172# move the library to its final location. Use test-dd to test it
173# before then. 173# before then.
174 174
175test-dd: 175test-dd:
176 echo 176 echo
177 echo Testing installed dynamic shared library in $(DL). 177 echo Testing installed dynamic shared library in $(DL).
178 $(CC) -I$(DI) $(CFLAGS) \ 178 $(CC) -I$(DI) $(CFLAGS) \
179 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 179 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
180 -L$(DL) -L$(ZLIBLIB) \ 180 -L$(DL) -L$(ZLIBLIB) \
181 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 181 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
182 ./pngtestd pngtest.png 182 ./pngtestd pngtest.png
183 183
184test-installed: 184test-installed:
185 $(CC) $(CFLAGS) \ 185 $(CC) $(CFLAGS) \
186 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 186 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
187 -L$(ZLIBLIB) \ 187 -L$(ZLIBLIB) \
188 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 188 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
189 ./pngtesti pngtest.png 189 ./pngtesti pngtest.png
190 190
191clean: 191clean:
192 $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ 192 $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
193 $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \ 193 $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
194 pnglibconf.h libpng.pc 194 pnglibconf.h libpng.pc
195 195
196DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 196DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
197writelock: 197writelock:
198 chmod a-w *.[ch35] $(DOCS) scripts/* 198 chmod a-w *.[ch35] $(DOCS) scripts/*
199 199
200# DO NOT DELETE THIS LINE -- make depend depends on it. 200# DO NOT DELETE THIS LINE -- make depend depends on it.
201 201
202png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 202png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
203pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 203pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
204pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 204pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
205pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 205pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
206pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 206pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
207pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 207pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
208pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 208pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
209pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 209pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
210pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 210pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
211pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 211pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
212pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 212pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
213pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 213pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
214pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 214pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
215pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 215pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
216pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 216pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
217 217
218pngtest.o: png.h pngconf.h pnglibconf.h 218pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sggcc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sggcc
index acc1006..1611638 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sggcc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sggcc
@@ -1,228 +1,228 @@
1# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc' 1# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
2# Copyright (C) 2001-2002, 2006, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 2001-2002, 2006, 2010-2011 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# Library name: 9# Library name:
10LIBNAME=libpng15 10LIBNAME=libpng15
11PNGMAJ = 15 11PNGMAJ = 15
12 12
13# Shared library names: 13# Shared library names:
14LIBSO=$(LIBNAME).so 14LIBSO=$(LIBNAME).so
15LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 15LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
16LIBSOREL=$(LIBSOMAJ).$(RELEASE) 16LIBSOREL=$(LIBSOMAJ).$(RELEASE)
17OLDSO=libpng.so 17OLDSO=libpng.so
18 18
19# Utilities: 19# Utilities:
20AR_RC=ar rc 20AR_RC=ar rc
21CC=gcc 21CC=gcc
22MKDIR_P=mkdir -p 22MKDIR_P=mkdir -p
23LN_SF=ln -sf 23LN_SF=ln -sf
24RANLIB=echo 24RANLIB=echo
25RM_F=/bin/rm -f 25RM_F=/bin/rm -f
26 26
27# Where make install puts libpng.a, libpng15.so, and libpng15/png.h 27# Where make install puts libpng.a, libpng15.so, and libpng15/png.h
28# Prefix must be a full pathname. 28# Prefix must be a full pathname.
29 29
30prefix=/usr/local 30prefix=/usr/local
31exec_prefix=$(prefix) 31exec_prefix=$(prefix)
32 32
33# Where the zlib library and include files are located 33# Where the zlib library and include files are located
34#ZLIBLIB=/usr/local/lib32 34#ZLIBLIB=/usr/local/lib32
35#ZLIBINC=/usr/local/include 35#ZLIBINC=/usr/local/include
36#ZLIBLIB=/usr/local/lib 36#ZLIBLIB=/usr/local/lib
37#ZLIBINC=/usr/local/include 37#ZLIBINC=/usr/local/include
38ZLIBLIB=../zlib 38ZLIBLIB=../zlib
39ZLIBINC=../zlib 39ZLIBINC=../zlib
40 40
41# ABI can be blank to use default for your system, -32, -o32, -n32, or -64 41# ABI can be blank to use default for your system, -32, -o32, -n32, or -64
42# See "man abi". zlib must be built with the same ABI. 42# See "man abi". zlib must be built with the same ABI.
43ABI= 43ABI=
44 44
45WARNMORE= # -g -DPNG_DEBUG=5 45WARNMORE= # -g -DPNG_DEBUG=5
46CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 46CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32
47LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm 47LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
48LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ 48LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
49 -set_version sgi$(PNGMAJ).0 49 -set_version sgi$(PNGMAJ).0
50# See "man dso" for info about shared objects 50# See "man dso" for info about shared objects
51 51
52INCPATH=$(prefix)/include 52INCPATH=$(prefix)/include
53LIBPATH=$(exec_prefix)/lib 53LIBPATH=$(exec_prefix)/lib
54#LIBPATH=$(exec_prefix)/lib32 54#LIBPATH=$(exec_prefix)/lib32
55MANPATH=$(prefix)/man 55MANPATH=$(prefix)/man
56BINPATH=$(exec_prefix)/bin 56BINPATH=$(exec_prefix)/bin
57 57
58# override DESTDIR= on the make install command line to easily support 58# override DESTDIR= on the make install command line to easily support
59# installing into a temporary location. Example: 59# installing into a temporary location. Example:
60# 60#
61# make install DESTDIR=/tmp/build/libpng 61# make install DESTDIR=/tmp/build/libpng
62# 62#
63# If you're going to install into a temporary location 63# If you're going to install into a temporary location
64# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 64# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
65# you execute make install. 65# you execute make install.
66DESTDIR= 66DESTDIR=
67 67
68DB=$(DESTDIR)$(BINPATH) 68DB=$(DESTDIR)$(BINPATH)
69DI=$(DESTDIR)$(INCPATH) 69DI=$(DESTDIR)$(INCPATH)
70DL=$(DESTDIR)$(LIBPATH) 70DL=$(DESTDIR)$(LIBPATH)
71DM=$(DESTDIR)$(MANPATH) 71DM=$(DESTDIR)$(MANPATH)
72 72
73OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 73OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
74 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 74 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
75 pngwtran.o pngmem.o pngerror.o pngpread.o 75 pngwtran.o pngmem.o pngerror.o pngpread.o
76 76
77all: libpng.a pngtest shared libpng.pc libpng-config 77all: libpng.a pngtest shared libpng.pc libpng-config
78 78
79# see scripts/pnglibconf.mak for more options 79# see scripts/pnglibconf.mak for more options
80pnglibconf.h: scripts/pnglibconf.h.prebuilt 80pnglibconf.h: scripts/pnglibconf.h.prebuilt
81 cp scripts/pnglibconf.h.prebuilt $@ 81 cp scripts/pnglibconf.h.prebuilt $@
82 82
83libpng.a: $(OBJS) 83libpng.a: $(OBJS)
84 $(AR_RC) $@ $(OBJS) 84 $(AR_RC) $@ $(OBJS)
85 $(RANLIB) $@ 85 $(RANLIB) $@
86 86
87shared: $(LIBSOMAJ) 87shared: $(LIBSOMAJ)
88 88
89libpng.pc: 89libpng.pc:
90 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 90 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
91 -e s!@exec_prefix@!$(exec_prefix)! \ 91 -e s!@exec_prefix@!$(exec_prefix)! \
92 -e s!@libdir@!$(LIBPATH)! \ 92 -e s!@libdir@!$(LIBPATH)! \
93 -e s!@includedir@!$(INCPATH)! \ 93 -e s!@includedir@!$(INCPATH)! \
94 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 94 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
95 95
96libpng-config: 96libpng-config:
97 ( cat scripts/libpng-config-head.in; \ 97 ( cat scripts/libpng-config-head.in; \
98 echo prefix=\"$(prefix)\"; \ 98 echo prefix=\"$(prefix)\"; \
99 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 99 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
100 echo ccopts=\"$(ABI)\"; \ 100 echo ccopts=\"$(ABI)\"; \
101 echo cppflags=\"\"; \ 101 echo cppflags=\"\"; \
102 echo ldopts=\"$(ABI)\"; \ 102 echo ldopts=\"$(ABI)\"; \
103 echo L_opts=\"-L$(LIBPATH)\"; \ 103 echo L_opts=\"-L$(LIBPATH)\"; \
104 echo libdir=\"$(LIBPATH)\"; \ 104 echo libdir=\"$(LIBPATH)\"; \
105 echo libs=\"-lpng15 -lz -lm\"; \ 105 echo libs=\"-lpng15 -lz -lm\"; \
106 cat scripts/libpng-config-body.in ) > libpng-config 106 cat scripts/libpng-config-body.in ) > libpng-config
107 chmod +x libpng-config 107 chmod +x libpng-config
108 108
109$(LIBSO): $(LIBSOMAJ) 109$(LIBSO): $(LIBSOMAJ)
110 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 110 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
111 111
112$(LIBSOMAJ): $(OBJS) 112$(LIBSOMAJ): $(OBJS)
113 $(LDSHARED) -o $@ $(OBJS) 113 $(LDSHARED) -o $@ $(OBJS)
114 $(RM_F) $(LIBSO) $(LIBSOMAJ) 114 $(RM_F) $(LIBSO) $(LIBSOMAJ)
115 115
116pngtest: pngtest.o libpng.a 116pngtest: pngtest.o libpng.a
117 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 117 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
118 118
119test: pngtest 119test: pngtest
120 echo 120 echo
121 echo Testing local static library. 121 echo Testing local static library.
122 ./pngtest 122 ./pngtest
123 123
124install-headers: png.h pngconf.h pnglibconf.h 124install-headers: png.h pngconf.h pnglibconf.h
125 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 125 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
126 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 126 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
127 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 127 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
128 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 128 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
129 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 129 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
130 -@$(RM_F) $(DI)/libpng 130 -@$(RM_F) $(DI)/libpng
131 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 131 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
132 132
133install-static: install-headers libpng.a 133install-static: install-headers libpng.a
134 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 134 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
135 cp libpng.a $(DL)/$(LIBNAME).a 135 cp libpng.a $(DL)/$(LIBNAME).a
136 chmod 644 $(DL)/$(LIBNAME).a 136 chmod 644 $(DL)/$(LIBNAME).a
137 -@$(RM_F) $(DL)/libpng.a 137 -@$(RM_F) $(DL)/libpng.a
138 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 138 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
139 139
140install-shared: install-headers $(LIBSOMAJ) libpng.pc 140install-shared: install-headers $(LIBSOMAJ) libpng.pc
141 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 141 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
142 -@$(RM_F) $(DL)/$(LIBSO) 142 -@$(RM_F) $(DL)/$(LIBSO)
143 -@$(RM_F) $(DL)/$(LIBSOREL) 143 -@$(RM_F) $(DL)/$(LIBSOREL)
144 -@$(RM_F) $(DL)/$(OLDSO) 144 -@$(RM_F) $(DL)/$(OLDSO)
145 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 145 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
146 chmod 755 $(DL)/$(LIBSOREL) 146 chmod 755 $(DL)/$(LIBSOREL)
147 (cd $(DL); \ 147 (cd $(DL); \
148 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 148 $(LN_SF) $(LIBSOREL) $(LIBSO); \
149 $(LN_SF) $(LIBSO) $(OLDSO)) 149 $(LN_SF) $(LIBSO) $(OLDSO))
150 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 150 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
151 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 151 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
152 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 152 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
153 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 153 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
154 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 154 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
155 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 155 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
156 156
157install-man: libpng.3 libpngpf.3 png.5 157install-man: libpng.3 libpngpf.3 png.5
158 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 158 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
159 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 159 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
160 -@$(RM_F) $(DM)/man3/libpng.3 160 -@$(RM_F) $(DM)/man3/libpng.3
161 -@$(RM_F) $(DM)/man3/libpngpf.3 161 -@$(RM_F) $(DM)/man3/libpngpf.3
162 cp libpng.3 $(DM)/man3 162 cp libpng.3 $(DM)/man3
163 cp libpngpf.3 $(DM)/man3 163 cp libpngpf.3 $(DM)/man3
164 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 164 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
165 -@$(RM_F) $(DM)/man5/png.5 165 -@$(RM_F) $(DM)/man5/png.5
166 cp png.5 $(DM)/man5 166 cp png.5 $(DM)/man5
167 167
168install-config: libpng-config 168install-config: libpng-config
169 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 169 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
170 -@$(RM_F) $(DB)/libpng-config 170 -@$(RM_F) $(DB)/libpng-config
171 -@$(RM_F) $(DB)/$(LIBNAME)-config 171 -@$(RM_F) $(DB)/$(LIBNAME)-config
172 cp libpng-config $(DB)/$(LIBNAME)-config 172 cp libpng-config $(DB)/$(LIBNAME)-config
173 chmod 755 $(DB)/$(LIBNAME)-config 173 chmod 755 $(DB)/$(LIBNAME)-config
174 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 174 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
175 175
176install: install-static install-shared install-man install-config 176install: install-static install-shared install-man install-config
177 177
178# If you installed in $(DESTDIR), test-installed won't work until you 178# If you installed in $(DESTDIR), test-installed won't work until you
179# move the library to its final location. Use test-dd to test it 179# move the library to its final location. Use test-dd to test it
180# before then. 180# before then.
181 181
182test-dd: 182test-dd:
183 echo 183 echo
184 echo Testing installed dynamic shared library in $(DL). 184 echo Testing installed dynamic shared library in $(DL).
185 $(CC) -I$(DI) -I$(ZLIBINC) \ 185 $(CC) -I$(DI) -I$(ZLIBINC) \
186 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 186 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
187 -L$(DL) -L$(ZLIBLIB) \ 187 -L$(DL) -L$(ZLIBLIB) \
188 -rpath $(ZLIBLIB):$(DL) \ 188 -rpath $(ZLIBLIB):$(DL) \
189 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 189 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
190 ./pngtestd pngtest.png 190 ./pngtestd pngtest.png
191 191
192test-installed: 192test-installed:
193 echo 193 echo
194 echo Testing installed dynamic shared library. 194 echo Testing installed dynamic shared library.
195 $(CC) -I$(ZLIBINC) \ 195 $(CC) -I$(ZLIBINC) \
196 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 196 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
197 -L$(ZLIBLIB) \ 197 -L$(ZLIBLIB) \
198 -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \ 198 -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \
199 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 199 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
200 ./pngtesti pngtest.png 200 ./pngtesti pngtest.png
201 201
202clean: 202clean:
203 $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \ 203 $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \
204 so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* pnglibconf.h 204 so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
205 205
206DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 206DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
207writelock: 207writelock:
208 chmod a-w *.[ch35] $(DOCS) scripts/* 208 chmod a-w *.[ch35] $(DOCS) scripts/*
209 209
210# DO NOT DELETE THIS LINE -- make depend depends on it. 210# DO NOT DELETE THIS LINE -- make depend depends on it.
211 211
212png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 212png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
213pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 213pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
214pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 214pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
215pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 215pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
216pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 216pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
217pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 217pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
218pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 218pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
219pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 219pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
220pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 220pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
221pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 221pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
222pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 222pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
223pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 223pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
224pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 224pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
225pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227 227
228pngtest.o: png.h pngconf.h pnglibconf.h 228pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sgi b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sgi
index ab44f2d..83db59f 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sgi
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sgi
@@ -1,229 +1,229 @@
1# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc' 1# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
2# Copyright (C) 2001-2002, 2006, 2007, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 2001-2002, 2006, 2007, 2010-2011 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# Library name: 9# Library name:
10LIBNAME=libpng15 10LIBNAME=libpng15
11PNGMAJ = 15 11PNGMAJ = 15
12 12
13# Shared library names: 13# Shared library names:
14LIBSO=$(LIBNAME).so 14LIBSO=$(LIBNAME).so
15LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 15LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
16LIBSOREL=$(LIBSOMAJ).$(RELEASE) 16LIBSOREL=$(LIBSOMAJ).$(RELEASE)
17OLDSO=libpng.so 17OLDSO=libpng.so
18 18
19# Utilities: 19# Utilities:
20AR_RC=ar rc 20AR_RC=ar rc
21CC=cc 21CC=cc
22MKDIR_P=mkdir -p 22MKDIR_P=mkdir -p
23LN_SF=ln -sf 23LN_SF=ln -sf
24RANLIB=echo 24RANLIB=echo
25RM_F=/bin/rm -f 25RM_F=/bin/rm -f
26 26
27# Where make install puts libpng.a, libpng15.so, and libpng15/png.h 27# Where make install puts libpng.a, libpng15.so, and libpng15/png.h
28# Prefix must be a full pathname. 28# Prefix must be a full pathname.
29 29
30prefix=/usr/local 30prefix=/usr/local
31exec_prefix=$(prefix) 31exec_prefix=$(prefix)
32 32
33# Where the zlib library and include files are located 33# Where the zlib library and include files are located
34#ZLIBLIB=/usr/local/lib32 34#ZLIBLIB=/usr/local/lib32
35#ZLIBINC=/usr/local/include 35#ZLIBINC=/usr/local/include
36#ZLIBLIB=/usr/local/lib 36#ZLIBLIB=/usr/local/lib
37#ZLIBINC=/usr/local/include 37#ZLIBINC=/usr/local/include
38ZLIBLIB=../zlib 38ZLIBLIB=../zlib
39ZLIBINC=../zlib 39ZLIBINC=../zlib
40 40
41# ABI can be blank to use default for your system, -32, -o32, -n32, or -64 41# ABI can be blank to use default for your system, -32, -o32, -n32, or -64
42# See "man abi". zlib must be built with the same ABI. 42# See "man abi". zlib must be built with the same ABI.
43ABI= 43ABI=
44 44
45WARNMORE=-fullwarn 45WARNMORE=-fullwarn
46# Note: -KPIC is the default anyhow 46# Note: -KPIC is the default anyhow
47#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 47#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5
48CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) 48CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE)
49LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng15 -lz -lm 49LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng15 -lz -lm
50LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm 50LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
51LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ 51LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
52 -set_version sgi$(PNGMAJ).0 52 -set_version sgi$(PNGMAJ).0
53# See "man dso" for info about shared objects 53# See "man dso" for info about shared objects
54 54
55INCPATH=$(prefix)/include 55INCPATH=$(prefix)/include
56LIBPATH=$(exec_prefix)/lib 56LIBPATH=$(exec_prefix)/lib
57#LIBPATH=$(exec_prefix)/lib32 57#LIBPATH=$(exec_prefix)/lib32
58MANPATH=$(prefix)/man 58MANPATH=$(prefix)/man
59BINPATH=$(exec_prefix)/bin 59BINPATH=$(exec_prefix)/bin
60 60
61# override DESTDIR= on the make install command line to easily support 61# override DESTDIR= on the make install command line to easily support
62# installing into a temporary location. Example: 62# installing into a temporary location. Example:
63# 63#
64# make install DESTDIR=/tmp/build/libpng 64# make install DESTDIR=/tmp/build/libpng
65# 65#
66# If you're going to install into a temporary location 66# If you're going to install into a temporary location
67# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 67# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
68# you execute make install. 68# you execute make install.
69DESTDIR= 69DESTDIR=
70 70
71DB=$(DESTDIR)$(BINPATH) 71DB=$(DESTDIR)$(BINPATH)
72DI=$(DESTDIR)$(INCPATH) 72DI=$(DESTDIR)$(INCPATH)
73DL=$(DESTDIR)$(LIBPATH) 73DL=$(DESTDIR)$(LIBPATH)
74DM=$(DESTDIR)$(MANPATH) 74DM=$(DESTDIR)$(MANPATH)
75 75
76OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 76OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
77 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 77 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
78 pngwtran.o pngmem.o pngerror.o pngpread.o 78 pngwtran.o pngmem.o pngerror.o pngpread.o
79 79
80all: libpng.a pngtest shared libpng.pc libpng-config 80all: libpng.a pngtest shared libpng.pc libpng-config
81 81
82# see scripts/pnglibconf.mak for more options 82# see scripts/pnglibconf.mak for more options
83pnglibconf.h: scripts/pnglibconf.h.prebuilt 83pnglibconf.h: scripts/pnglibconf.h.prebuilt
84 cp scripts/pnglibconf.h.prebuilt $@ 84 cp scripts/pnglibconf.h.prebuilt $@
85 85
86libpng.a: $(OBJS) 86libpng.a: $(OBJS)
87 $(AR_RC) $@ $(OBJS) 87 $(AR_RC) $@ $(OBJS)
88 $(RANLIB) $@ 88 $(RANLIB) $@
89 89
90libpng.pc: 90libpng.pc:
91 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 91 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
92 -e s!@exec_prefix@!$(exec_prefix)! \ 92 -e s!@exec_prefix@!$(exec_prefix)! \
93 -e s!@libdir@!$(LIBPATH)! \ 93 -e s!@libdir@!$(LIBPATH)! \
94 -e s!@includedir@!$(INCPATH)! \ 94 -e s!@includedir@!$(INCPATH)! \
95 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 95 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
96 96
97libpng-config: 97libpng-config:
98 ( cat scripts/libpng-config-head.in; \ 98 ( cat scripts/libpng-config-head.in; \
99 echo prefix=\"$(prefix)\"; \ 99 echo prefix=\"$(prefix)\"; \
100 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 100 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
101 echo ccopts=\"$(ABI)\"; \ 101 echo ccopts=\"$(ABI)\"; \
102 echo ldopts=\"$(ABI)\"; \ 102 echo ldopts=\"$(ABI)\"; \
103 echo L_opts=\"-L$(LIBPATH)\"; \ 103 echo L_opts=\"-L$(LIBPATH)\"; \
104 echo libdir=\"$(LIBPATH)\"; \ 104 echo libdir=\"$(LIBPATH)\"; \
105 echo libs=\"-lpng15 -lz -lm\"; \ 105 echo libs=\"-lpng15 -lz -lm\"; \
106 cat scripts/libpng-config-body.in ) > libpng-config 106 cat scripts/libpng-config-body.in ) > libpng-config
107 chmod +x libpng-config 107 chmod +x libpng-config
108 108
109$(LIBSO): $(LIBSOMAJ) 109$(LIBSO): $(LIBSOMAJ)
110 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 110 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
111 111
112$(LIBSOMAJ): $(OBJS) 112$(LIBSOMAJ): $(OBJS)
113 $(LDSHARED) -o $@ $(OBJS) 113 $(LDSHARED) -o $@ $(OBJS)
114 $(RM_F) $(LIBSO) $(LIBSOMAJ) 114 $(RM_F) $(LIBSO) $(LIBSOMAJ)
115 115
116pngtest: pngtest.o libpng.a 116pngtest: pngtest.o libpng.a
117 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 117 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
118 118
119test: pngtest 119test: pngtest
120 echo 120 echo
121 echo Testing local static library. 121 echo Testing local static library.
122 ./pngtest 122 ./pngtest
123 123
124install-headers: png.h pngconf.h pnglibconf.h 124install-headers: png.h pngconf.h pnglibconf.h
125 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 125 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
126 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 126 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
127 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 127 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
128 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 128 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
129 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 129 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
130 -@$(RM_F) $(DI)/libpng 130 -@$(RM_F) $(DI)/libpng
131 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 131 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
132 132
133install-static: install-headers libpng.a 133install-static: install-headers libpng.a
134 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 134 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
135 cp libpng.a $(DL)/$(LIBNAME).a 135 cp libpng.a $(DL)/$(LIBNAME).a
136 chmod 644 $(DL)/$(LIBNAME).a 136 chmod 644 $(DL)/$(LIBNAME).a
137 -@$(RM_F) $(DL)/libpng.a 137 -@$(RM_F) $(DL)/libpng.a
138 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 138 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
139 139
140install-shared: install-headers $(LIBSOMAJ) libpng.pc 140install-shared: install-headers $(LIBSOMAJ) libpng.pc
141 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 141 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
142 -@$(RM_F) $(DL)/$(LIBSO) 142 -@$(RM_F) $(DL)/$(LIBSO)
143 -@$(RM_F) $(DL)/$(LIBSOREL) 143 -@$(RM_F) $(DL)/$(LIBSOREL)
144 -@$(RM_F) $(DL)/$(OLDSO) 144 -@$(RM_F) $(DL)/$(OLDSO)
145 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 145 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
146 chmod 755 $(DL)/$(LIBSOREL) 146 chmod 755 $(DL)/$(LIBSOREL)
147 (cd $(DL); \ 147 (cd $(DL); \
148 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 148 $(LN_SF) $(LIBSOREL) $(LIBSO); \
149 $(LN_SF) $(LIBSO) $(OLDSO)) 149 $(LN_SF) $(LIBSO) $(OLDSO))
150 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 150 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
151 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 151 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
152 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 152 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
153 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 153 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
154 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 154 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
155 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 155 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
156 156
157install-man: libpng.3 libpngpf.3 png.5 157install-man: libpng.3 libpngpf.3 png.5
158 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 158 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
159 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 159 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
160 -@$(RM_F) $(DM)/man3/libpng.3 160 -@$(RM_F) $(DM)/man3/libpng.3
161 -@$(RM_F) $(DM)/man3/libpngpf.3 161 -@$(RM_F) $(DM)/man3/libpngpf.3
162 cp libpng.3 $(DM)/man3 162 cp libpng.3 $(DM)/man3
163 cp libpngpf.3 $(DM)/man3 163 cp libpngpf.3 $(DM)/man3
164 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 164 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
165 -@$(RM_F) $(DM)/man5/png.5 165 -@$(RM_F) $(DM)/man5/png.5
166 cp png.5 $(DM)/man5 166 cp png.5 $(DM)/man5
167 167
168install-config: libpng-config 168install-config: libpng-config
169 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 169 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
170 -@$(RM_F) $(DB)/libpng-config 170 -@$(RM_F) $(DB)/libpng-config
171 -@$(RM_F) $(DB)/$(LIBNAME)-config 171 -@$(RM_F) $(DB)/$(LIBNAME)-config
172 cp libpng-config $(DB)/$(LIBNAME)-config 172 cp libpng-config $(DB)/$(LIBNAME)-config
173 chmod 755 $(DB)/$(LIBNAME)-config 173 chmod 755 $(DB)/$(LIBNAME)-config
174 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 174 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
175 175
176install: install-static install-shared install-man install-config 176install: install-static install-shared install-man install-config
177 177
178# If you installed in $(DESTDIR), test-installed won't work until you 178# If you installed in $(DESTDIR), test-installed won't work until you
179# move the library to its final location. Use test-dd to test it 179# move the library to its final location. Use test-dd to test it
180# before then. 180# before then.
181 181
182test-dd: 182test-dd:
183 echo 183 echo
184 echo Testing installed dynamic shared library in $(DL). 184 echo Testing installed dynamic shared library in $(DL).
185 $(CC) -I$(DI) -I$(ZLIBINC) \ 185 $(CC) -I$(DI) -I$(ZLIBINC) \
186 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 186 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
187 -L$(DL) -L$(ZLIBLIB) \ 187 -L$(DL) -L$(ZLIBLIB) \
188 -rpath $(ZLIBLIB):$(DL) \ 188 -rpath $(ZLIBLIB):$(DL) \
189 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` 189 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
190 ./pngtestd pngtest.png 190 ./pngtestd pngtest.png
191 191
192test-installed: 192test-installed:
193 echo 193 echo
194 echo Testing installed dynamic shared library. 194 echo Testing installed dynamic shared library.
195 $(CC) -I$(ZLIBINC) \ 195 $(CC) -I$(ZLIBINC) \
196 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 196 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
197 -L$(ZLIBLIB) \ 197 -L$(ZLIBLIB) \
198 -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \ 198 -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \
199 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` 199 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
200 ./pngtesti pngtest.png 200 ./pngtesti pngtest.png
201 201
202clean: 202clean:
203 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ 203 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
204 $(LIBSO) $(LIBSOMAJ)* \ 204 $(LIBSO) $(LIBSOMAJ)* \
205 so_locations pnglibconf.h 205 so_locations pnglibconf.h
206 206
207DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 207DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
208writelock: 208writelock:
209 chmod a-w *.[ch35] $(DOCS) scripts/* 209 chmod a-w *.[ch35] $(DOCS) scripts/*
210 210
211# DO NOT DELETE THIS LINE -- make depend depends on it. 211# DO NOT DELETE THIS LINE -- make depend depends on it.
212 212
213png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 213png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
214pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 214pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
215pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 215pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
216pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 216pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
217pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 217pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
218pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 218pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
219pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 219pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
220pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 220pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
221pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 221pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
222pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 222pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
223pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 223pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
224pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 224pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
225pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 227pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
228 228
229pngtest.o: png.h pngconf.h pnglibconf.h 229pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.so9 b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.so9
index 967b342..615c2e3 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.so9
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.so9
@@ -1,239 +1,239 @@
1# makefile for libpng on Solaris 9 (beta) with Forte cc 1# makefile for libpng on Solaris 9 (beta) with Forte cc
2# Updated by Chad Schrock for Solaris 9 2# Updated by Chad Schrock for Solaris 9
3# Contributed by William L. Sebok, based on makefile.linux 3# Contributed by William L. Sebok, based on makefile.linux
4# Copyright (C) 2002, 2006, 2008, 2010-2011 Glenn Randers-Pehrson 4# Copyright (C) 2002, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
5# Copyright (C) 1998-2001 Greg Roelofs 5# Copyright (C) 1998-2001 Greg Roelofs
6# Copyright (C) 1996-1997 Andreas Dilger 6# Copyright (C) 1996-1997 Andreas Dilger
7# 7#
8# This code is released under the libpng license. 8# This code is released under the libpng license.
9# For conditions of distribution and use, see the disclaimer 9# For conditions of distribution and use, see the disclaimer
10# and license in png.h 10# and license in png.h
11 11
12# Library name: 12# Library name:
13PNGMAJ = 15 13PNGMAJ = 15
14LIBNAME = libpng15 14LIBNAME = libpng15
15 15
16# Shared library names: 16# Shared library names:
17LIBSO=$(LIBNAME).so 17LIBSO=$(LIBNAME).so
18LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 18LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
19LIBSOREL=$(LIBSOMAJ).$(RELEASE) 19LIBSOREL=$(LIBSOMAJ).$(RELEASE)
20OLDSO=libpng.so 20OLDSO=libpng.so
21 21
22# Utilities: 22# Utilities:
23# gcc 2.95 doesn't work. 23# gcc 2.95 doesn't work.
24CC=cc 24CC=cc
25AR_RC=ar rc 25AR_RC=ar rc
26MKDIR_P=mkdir -p 26MKDIR_P=mkdir -p
27LN_SF=ln -f -s 27LN_SF=ln -f -s
28RANLIB=echo 28RANLIB=echo
29RM_F=/bin/rm -f 29RM_F=/bin/rm -f
30 30
31# Where make install puts libpng.a, $(OLDSO)*, and png.h 31# Where make install puts libpng.a, $(OLDSO)*, and png.h
32prefix=/usr/local 32prefix=/usr/local
33exec_prefix=$(prefix) 33exec_prefix=$(prefix)
34 34
35# Where the zlib library and include files are located 35# Where the zlib library and include files are located
36# Changing these to ../zlib poses a security risk. If you want 36# Changing these to ../zlib poses a security risk. If you want
37# to have zlib in an adjacent directory, specify the full path instead of "..". 37# to have zlib in an adjacent directory, specify the full path instead of "..".
38#ZLIBLIB=../zlib 38#ZLIBLIB=../zlib
39#ZLIBINC=../zlib 39#ZLIBINC=../zlib
40#ZLIBLIB=/usr/local/lib 40#ZLIBLIB=/usr/local/lib
41#ZLIBINC=/usr/local/include 41#ZLIBINC=/usr/local/include
42#Use the preinstalled zlib that comes with Solaris 9: 42#Use the preinstalled zlib that comes with Solaris 9:
43ZLIBLIB=/usr/lib 43ZLIBLIB=/usr/lib
44ZLIBINC=/usr/include 44ZLIBINC=/usr/include
45 45
46#WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 46#WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
47 -Wmissing-declarations -Wtraditional -Wcast-align \ 47 -Wmissing-declarations -Wtraditional -Wcast-align \
48 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 48 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
49#CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE 49#CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE
50CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE 50CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
51LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm 51LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
52 52
53INCPATH=$(prefix)/include 53INCPATH=$(prefix)/include
54LIBPATH=$(exec_prefix)/lib 54LIBPATH=$(exec_prefix)/lib
55MANPATH=$(prefix)/man 55MANPATH=$(prefix)/man
56BINPATH=$(exec_prefix)/bin 56BINPATH=$(exec_prefix)/bin
57 57
58# override DESTDIR= on the make install command line to easily support 58# override DESTDIR= on the make install command line to easily support
59# installing into a temporary location. Example: 59# installing into a temporary location. Example:
60# 60#
61# make install DESTDIR=/tmp/build/libpng 61# make install DESTDIR=/tmp/build/libpng
62# 62#
63# If you're going to install into a temporary location 63# If you're going to install into a temporary location
64# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 64# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
65# you execute make install. 65# you execute make install.
66DESTDIR= 66DESTDIR=
67 67
68DB=$(DESTDIR)$(BINPATH) 68DB=$(DESTDIR)$(BINPATH)
69DI=$(DESTDIR)$(INCPATH) 69DI=$(DESTDIR)$(INCPATH)
70DL=$(DESTDIR)$(LIBPATH) 70DL=$(DESTDIR)$(LIBPATH)
71DM=$(DESTDIR)$(MANPATH) 71DM=$(DESTDIR)$(MANPATH)
72 72
73OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 73OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
74 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 74 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
75 pngwtran.o pngmem.o pngerror.o pngpread.o 75 pngwtran.o pngmem.o pngerror.o pngpread.o
76 76
77OBJSDLL = $(OBJS:.o=.pic.o) 77OBJSDLL = $(OBJS:.o=.pic.o)
78 78
79.SUFFIXES: .c .o .pic.o 79.SUFFIXES: .c .o .pic.o
80 80
81.c.pic.o: 81.c.pic.o:
82 $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c 82 $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
83 83
84all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 84all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
85 85
86# see scripts/pnglibconf.mak for more options 86# see scripts/pnglibconf.mak for more options
87pnglibconf.h: scripts/pnglibconf.h.prebuilt 87pnglibconf.h: scripts/pnglibconf.h.prebuilt
88 cp scripts/pnglibconf.h.prebuilt $@ 88 cp scripts/pnglibconf.h.prebuilt $@
89 89
90libpng.a: $(OBJS) 90libpng.a: $(OBJS)
91 $(AR_RC) $@ $(OBJS) 91 $(AR_RC) $@ $(OBJS)
92 $(RANLIB) $@ 92 $(RANLIB) $@
93 93
94libpng.pc: 94libpng.pc:
95 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 95 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
96 -e s!@exec_prefix@!$(exec_prefix)! \ 96 -e s!@exec_prefix@!$(exec_prefix)! \
97 -e s!@libdir@!$(LIBPATH)! \ 97 -e s!@libdir@!$(LIBPATH)! \
98 -e s!@includedir@!$(INCPATH)! \ 98 -e s!@includedir@!$(INCPATH)! \
99 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 99 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
100 100
101libpng-config: 101libpng-config:
102 ( cat scripts/libpng-config-head.in; \ 102 ( cat scripts/libpng-config-head.in; \
103 echo prefix=\"$(prefix)\"; \ 103 echo prefix=\"$(prefix)\"; \
104 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 104 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
105 echo L_opts=\"-L$(LIBPATH)\"; \ 105 echo L_opts=\"-L$(LIBPATH)\"; \
106 echo R_opts=\"-R$(LIBPATH)\"; \ 106 echo R_opts=\"-R$(LIBPATH)\"; \
107 echo libs=\"-lpng15 -lz -lm\"; \ 107 echo libs=\"-lpng15 -lz -lm\"; \
108 cat scripts/libpng-config-body.in ) > libpng-config 108 cat scripts/libpng-config-body.in ) > libpng-config
109 chmod +x libpng-config 109 chmod +x libpng-config
110 110
111$(LIBSO): $(LIBSOMAJ) 111$(LIBSO): $(LIBSOMAJ)
112 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 112 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
113 113
114$(LIBSOMAJ): $(OBJSDLL) 114$(LIBSOMAJ): $(OBJSDLL)
115 @case "`type ld`" in *ucb*) \ 115 @case "`type ld`" in *ucb*) \
116 echo; \ 116 echo; \
117 echo '## WARNING:'; \ 117 echo '## WARNING:'; \
118 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \ 118 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \
119 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \ 119 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \
120 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \ 120 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \
121 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \ 121 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \
122 echo '## at all. If it is, things are likely to break because of'; \ 122 echo '## at all. If it is, things are likely to break because of'; \
123 echo '## the libucb dependency that is created.'; \ 123 echo '## the libucb dependency that is created.'; \
124 echo; \ 124 echo; \
125 ;; \ 125 ;; \
126 esac 126 esac
127 $(LD) -G -h $(LIBSOMAJ) \ 127 $(LD) -G -h $(LIBSOMAJ) \
128 -o $(LIBSOMAJ) $(OBJSDLL) 128 -o $(LIBSOMAJ) $(OBJSDLL)
129 129
130pngtest: pngtest.o $(LIBSO) 130pngtest: pngtest.o $(LIBSO)
131 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 131 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
132 132
133test: pngtest 133test: pngtest
134 ./pngtest 134 ./pngtest
135 135
136install-headers: png.h pngconf.h pnglibconf.h 136install-headers: png.h pngconf.h pnglibconf.h
137 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 137 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
138 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 138 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
139 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 139 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
140 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 140 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
141 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 141 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
142 -@$(RM_F) $(DI)/libpng 142 -@$(RM_F) $(DI)/libpng
143 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 143 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
144 144
145install-static: install-headers libpng.a 145install-static: install-headers libpng.a
146 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 146 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
147 cp libpng.a $(DL)/$(LIBNAME).a 147 cp libpng.a $(DL)/$(LIBNAME).a
148 chmod 644 $(DL)/$(LIBNAME).a 148 chmod 644 $(DL)/$(LIBNAME).a
149 -@$(RM_F) $(DL)/libpng.a 149 -@$(RM_F) $(DL)/libpng.a
150 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 150 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
151 151
152install-shared: install-headers $(LIBSOMAJ) libpng.pc 152install-shared: install-headers $(LIBSOMAJ) libpng.pc
153 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 153 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
154 -@$(RM_F) $(DL)/$(LIBSO) 154 -@$(RM_F) $(DL)/$(LIBSO)
155 -@$(RM_F) $(DL)/$(LIBSOREL) 155 -@$(RM_F) $(DL)/$(LIBSOREL)
156 -@$(RM_F) $(DL)/$(OLDSO) 156 -@$(RM_F) $(DL)/$(OLDSO)
157 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 157 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
158 chmod 755 $(DL)/$(LIBSOREL) 158 chmod 755 $(DL)/$(LIBSOREL)
159 (cd $(DL); \ 159 (cd $(DL); \
160 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 160 $(LN_SF) $(LIBSOREL) $(LIBSO); \
161 $(LN_SF) $(LIBSO) $(OLDSO)) 161 $(LN_SF) $(LIBSO) $(OLDSO))
162 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 162 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
163 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 163 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
164 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 164 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
165 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 165 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
166 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 166 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
167 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 167 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
168 168
169install-man: libpng.3 libpngpf.3 png.5 169install-man: libpng.3 libpngpf.3 png.5
170 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 170 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
171 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 171 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
172 -@$(RM_F) $(DM)/man3/libpng.3 172 -@$(RM_F) $(DM)/man3/libpng.3
173 -@$(RM_F) $(DM)/man3/libpngpf.3 173 -@$(RM_F) $(DM)/man3/libpngpf.3
174 cp libpng.3 $(DM)/man3 174 cp libpng.3 $(DM)/man3
175 cp libpngpf.3 $(DM)/man3 175 cp libpngpf.3 $(DM)/man3
176 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 176 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
177 -@$(RM_F) $(DM)/man5/png.5 177 -@$(RM_F) $(DM)/man5/png.5
178 cp png.5 $(DM)/man5 178 cp png.5 $(DM)/man5
179 179
180install-config: libpng-config 180install-config: libpng-config
181 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 181 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
182 -@$(RM_F) $(DB)/libpng-config 182 -@$(RM_F) $(DB)/libpng-config
183 -@$(RM_F) $(DB)/$(LIBNAME)-config 183 -@$(RM_F) $(DB)/$(LIBNAME)-config
184 cp libpng-config $(DB)/$(LIBNAME)-config 184 cp libpng-config $(DB)/$(LIBNAME)-config
185 chmod 755 $(DB)/$(LIBNAME)-config 185 chmod 755 $(DB)/$(LIBNAME)-config
186 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 186 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
187 187
188install: install-static install-shared install-man install-config 188install: install-static install-shared install-man install-config
189 189
190# If you installed in $(DESTDIR), test-installed won't work until you 190# If you installed in $(DESTDIR), test-installed won't work until you
191# move the library to its final location. Use test-dd to test it 191# move the library to its final location. Use test-dd to test it
192# before then. 192# before then.
193 193
194test-dd: 194test-dd:
195 echo 195 echo
196 echo Testing installed dynamic shared library in $(DL). 196 echo Testing installed dynamic shared library in $(DL).
197 $(CC) -I$(DI) -I$(ZLIBINC) \ 197 $(CC) -I$(DI) -I$(ZLIBINC) \
198 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 198 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
199 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 199 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \
200 -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) 200 -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL)
201 ./pngtestd pngtest.png 201 ./pngtestd pngtest.png
202 202
203test-installed: 203test-installed:
204 echo 204 echo
205 echo Testing installed dynamic shared library. 205 echo Testing installed dynamic shared library.
206 $(CC) -I$(ZLIBINC) \ 206 $(CC) -I$(ZLIBINC) \
207 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 207 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
208 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 208 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
209 -L$(ZLIBLIB) -R$(ZLIBLIB) 209 -L$(ZLIBLIB) -R$(ZLIBLIB)
210 ./pngtesti pngtest.png 210 ./pngtesti pngtest.png
211 211
212clean: 212clean:
213 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ 213 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
214 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 214 libpng-config $(LIBSO) $(LIBSOMAJ)* \
215 libpng.pc pnglibconf.h 215 libpng.pc pnglibconf.h
216 216
217DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 217DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
218writelock: 218writelock:
219 chmod a-w *.[ch35] $(DOCS) scripts/* 219 chmod a-w *.[ch35] $(DOCS) scripts/*
220 220
221# DO NOT DELETE THIS LINE -- make depend depends on it. 221# DO NOT DELETE THIS LINE -- make depend depends on it.
222 222
223png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 223png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
224pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 224pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
225pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 227pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
228pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 228pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
229pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 229pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
230pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 230pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
231pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 231pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
232pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 232pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
233pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 233pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
234pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 234pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
235pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 235pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
236pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 236pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
237pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 237pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
238 238
239pngtest.o: png.h pngconf.h pnglibconf.h 239pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris
index 03fb314..24bd610 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris
@@ -1,236 +1,236 @@
1# makefile for libpng on Solaris 2.x with gcc 1# makefile for libpng on Solaris 2.x with gcc
2# Copyright (C) 2004, 2006-2008, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 2004, 2006-2008, 2010-2011 Glenn Randers-Pehrson
3# Contributed by William L. Sebok, based on makefile.linux 3# Contributed by William L. Sebok, based on makefile.linux
4# Copyright (C) 1998 Greg Roelofs 4# Copyright (C) 1998 Greg Roelofs
5# Copyright (C) 1996, 1997 Andreas Dilger 5# Copyright (C) 1996, 1997 Andreas Dilger
6# 6#
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# Library name: 11# Library name:
12LIBNAME = libpng15 12LIBNAME = libpng15
13PNGMAJ = 15 13PNGMAJ = 15
14 14
15# Shared library names: 15# Shared library names:
16LIBSO=$(LIBNAME).so 16LIBSO=$(LIBNAME).so
17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
18LIBSOREL=$(LIBSOMAJ).$(RELEASE) 18LIBSOREL=$(LIBSOMAJ).$(RELEASE)
19OLDSO=libpng.so 19OLDSO=libpng.so
20 20
21# Utilities: 21# Utilities:
22AR_RC=ar rc 22AR_RC=ar rc
23CC=gcc 23CC=gcc
24MKDIR_P=mkdir -p 24MKDIR_P=mkdir -p
25LN_SF=ln -f -s 25LN_SF=ln -f -s
26RANLIB=echo 26RANLIB=echo
27RM_F=/bin/rm -f 27RM_F=/bin/rm -f
28 28
29# Where make install puts libpng.a, libpng15.so*, and png.h 29# Where make install puts libpng.a, libpng15.so*, and png.h
30prefix=/usr/local 30prefix=/usr/local
31exec_prefix=$(prefix) 31exec_prefix=$(prefix)
32 32
33# Where the zlib library and include files are located 33# Where the zlib library and include files are located
34# Changing these to ../zlib poses a security risk. If you want 34# Changing these to ../zlib poses a security risk. If you want
35# to have zlib in an adjacent directory, specify the full path instead of "..". 35# to have zlib in an adjacent directory, specify the full path instead of "..".
36#ZLIBLIB=../zlib 36#ZLIBLIB=../zlib
37#ZLIBINC=../zlib 37#ZLIBINC=../zlib
38 38
39ZLIBLIB=/usr/local/lib 39ZLIBLIB=/usr/local/lib
40ZLIBINC=/usr/local/include 40ZLIBINC=/usr/local/include
41 41
42WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 42WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
43 -Wmissing-declarations -Wtraditional -Wcast-align \ 43 -Wmissing-declarations -Wtraditional -Wcast-align \
44 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 44 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
45CFLAGS=-I$(ZLIBINC) -W -Wall -O \ 45CFLAGS=-I$(ZLIBINC) -W -Wall -O \
46 # $(WARNMORE) -g -DPNG_DEBUG=5 46 # $(WARNMORE) -g -DPNG_DEBUG=5
47LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm 47LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
48 48
49INCPATH=$(prefix)/include 49INCPATH=$(prefix)/include
50LIBPATH=$(exec_prefix)/lib 50LIBPATH=$(exec_prefix)/lib
51MANPATH=$(prefix)/man 51MANPATH=$(prefix)/man
52BINPATH=$(exec_prefix)/bin 52BINPATH=$(exec_prefix)/bin
53 53
54# override DESTDIR= on the make install command line to easily support 54# override DESTDIR= on the make install command line to easily support
55# installing into a temporary location. Example: 55# installing into a temporary location. Example:
56# 56#
57# make install DESTDIR=/tmp/build/libpng 57# make install DESTDIR=/tmp/build/libpng
58# 58#
59# If you're going to install into a temporary location 59# If you're going to install into a temporary location
60# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 60# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
61# you execute make install. 61# you execute make install.
62DESTDIR= 62DESTDIR=
63 63
64DB=$(DESTDIR)$(BINPATH) 64DB=$(DESTDIR)$(BINPATH)
65DI=$(DESTDIR)$(INCPATH) 65DI=$(DESTDIR)$(INCPATH)
66DL=$(DESTDIR)$(LIBPATH) 66DL=$(DESTDIR)$(LIBPATH)
67DM=$(DESTDIR)$(MANPATH) 67DM=$(DESTDIR)$(MANPATH)
68 68
69OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 69OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
70 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 70 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
71 pngwtran.o pngmem.o pngerror.o pngpread.o 71 pngwtran.o pngmem.o pngerror.o pngpread.o
72 72
73OBJSDLL = $(OBJS:.o=.pic.o) 73OBJSDLL = $(OBJS:.o=.pic.o)
74 74
75.SUFFIXES: .c .o .pic.o 75.SUFFIXES: .c .o .pic.o
76 76
77.c.pic.o: 77.c.pic.o:
78 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c 78 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
79 79
80all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 80all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
81 81
82# see scripts/pnglibconf.mak for more options 82# see scripts/pnglibconf.mak for more options
83pnglibconf.h: scripts/pnglibconf.h.prebuilt 83pnglibconf.h: scripts/pnglibconf.h.prebuilt
84 cp scripts/pnglibconf.h.prebuilt $@ 84 cp scripts/pnglibconf.h.prebuilt $@
85 85
86libpng.a: $(OBJS) 86libpng.a: $(OBJS)
87 $(AR_RC) $@ $(OBJS) 87 $(AR_RC) $@ $(OBJS)
88 $(RANLIB) $@ 88 $(RANLIB) $@
89 89
90libpng.pc: 90libpng.pc:
91 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 91 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
92 -e s!@exec_prefix@!$(exec_prefix)! \ 92 -e s!@exec_prefix@!$(exec_prefix)! \
93 -e s!@libdir@!$(LIBPATH)! \ 93 -e s!@libdir@!$(LIBPATH)! \
94 -e s!@includedir@!$(INCPATH)! \ 94 -e s!@includedir@!$(INCPATH)! \
95 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 95 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
96 96
97libpng-config: 97libpng-config:
98 ( cat scripts/libpng-config-head.in; \ 98 ( cat scripts/libpng-config-head.in; \
99 echo prefix=\"$(prefix)\"; \ 99 echo prefix=\"$(prefix)\"; \
100 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 100 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
101 echo cppflags=\"\"; \ 101 echo cppflags=\"\"; \
102 echo L_opts=\"-L$(LIBPATH)\"; \ 102 echo L_opts=\"-L$(LIBPATH)\"; \
103 echo R_opts=\"-R$(LIBPATH)\"; \ 103 echo R_opts=\"-R$(LIBPATH)\"; \
104 echo libs=\"-lpng15 -lz -lm\"; \ 104 echo libs=\"-lpng15 -lz -lm\"; \
105 cat scripts/libpng-config-body.in ) > libpng-config 105 cat scripts/libpng-config-body.in ) > libpng-config
106 chmod +x libpng-config 106 chmod +x libpng-config
107 107
108$(LIBSO): $(LIBSOMAJ) 108$(LIBSO): $(LIBSOMAJ)
109 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 109 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
110 110
111$(LIBSOMAJ): $(OBJSDLL) 111$(LIBSOMAJ): $(OBJSDLL)
112 @case "`type ld`" in *ucb*) \ 112 @case "`type ld`" in *ucb*) \
113 echo; \ 113 echo; \
114 echo '## WARNING:'; \ 114 echo '## WARNING:'; \
115 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \ 115 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \
116 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \ 116 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \
117 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \ 117 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \
118 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \ 118 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \
119 echo '## at all. If it is, things are likely to break because of'; \ 119 echo '## at all. If it is, things are likely to break because of'; \
120 echo '## the libucb dependency that is created.'; \ 120 echo '## the libucb dependency that is created.'; \
121 echo; \ 121 echo; \
122 ;; \ 122 ;; \
123 esac 123 esac
124 $(LD) -G -h $(LIBSOMAJ) \ 124 $(LD) -G -h $(LIBSOMAJ) \
125 -o $(LIBSOMAJ) $(OBJSDLL) 125 -o $(LIBSOMAJ) $(OBJSDLL)
126 126
127pngtest: pngtest.o $(LIBSO) 127pngtest: pngtest.o $(LIBSO)
128 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 128 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
129 129
130test: pngtest 130test: pngtest
131 ./pngtest 131 ./pngtest
132 132
133install-headers: png.h pngconf.h pnglibconf.h 133install-headers: png.h pngconf.h pnglibconf.h
134 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 134 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
135 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 135 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
136 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 136 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
137 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 137 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
138 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 138 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
139 -@$(RM_F) $(DI)/libpng 139 -@$(RM_F) $(DI)/libpng
140 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 140 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
141 141
142install-static: install-headers libpng.a 142install-static: install-headers libpng.a
143 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 143 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
144 cp libpng.a $(DL)/$(LIBNAME).a 144 cp libpng.a $(DL)/$(LIBNAME).a
145 chmod 644 $(DL)/$(LIBNAME).a 145 chmod 644 $(DL)/$(LIBNAME).a
146 -@$(RM_F) $(DL)/libpng.a 146 -@$(RM_F) $(DL)/libpng.a
147 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 147 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
148 148
149install-shared: install-headers $(LIBSOMAJ) libpng.pc 149install-shared: install-headers $(LIBSOMAJ) libpng.pc
150 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 150 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
151 -@$(RM_F) $(DL)/$(LIBSO) 151 -@$(RM_F) $(DL)/$(LIBSO)
152 -@$(RM_F) $(DL)/$(LIBSOREL) 152 -@$(RM_F) $(DL)/$(LIBSOREL)
153 -@$(RM_F) $(DL)/$(OLDSO) 153 -@$(RM_F) $(DL)/$(OLDSO)
154 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 154 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
155 chmod 755 $(DL)/$(LIBSOREL) 155 chmod 755 $(DL)/$(LIBSOREL)
156 (cd $(DL); \ 156 (cd $(DL); \
157 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 157 $(LN_SF) $(LIBSOREL) $(LIBSO); \
158 $(LN_SF) $(LIBSO) $(OLDSO)) 158 $(LN_SF) $(LIBSO) $(OLDSO))
159 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 159 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
160 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 160 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
161 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 161 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
162 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 162 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
163 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 163 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
164 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 164 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
165 165
166install-man: libpng.3 libpngpf.3 png.5 166install-man: libpng.3 libpngpf.3 png.5
167 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 167 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
168 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 168 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
169 -@$(RM_F) $(DM)/man3/libpng.3 169 -@$(RM_F) $(DM)/man3/libpng.3
170 -@$(RM_F) $(DM)/man3/libpngpf.3 170 -@$(RM_F) $(DM)/man3/libpngpf.3
171 cp libpng.3 $(DM)/man3 171 cp libpng.3 $(DM)/man3
172 cp libpngpf.3 $(DM)/man3 172 cp libpngpf.3 $(DM)/man3
173 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 173 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
174 -@$(RM_F) $(DM)/man5/png.5 174 -@$(RM_F) $(DM)/man5/png.5
175 cp png.5 $(DM)/man5 175 cp png.5 $(DM)/man5
176 176
177install-config: libpng-config 177install-config: libpng-config
178 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 178 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
179 -@$(RM_F) $(DB)/libpng-config 179 -@$(RM_F) $(DB)/libpng-config
180 -@$(RM_F) $(DB)/$(LIBNAME)-config 180 -@$(RM_F) $(DB)/$(LIBNAME)-config
181 cp libpng-config $(DB)/$(LIBNAME)-config 181 cp libpng-config $(DB)/$(LIBNAME)-config
182 chmod 755 $(DB)/$(LIBNAME)-config 182 chmod 755 $(DB)/$(LIBNAME)-config
183 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 183 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
184 184
185install: install-static install-shared install-man install-config 185install: install-static install-shared install-man install-config
186 186
187# If you installed in $(DESTDIR), test-installed won't work until you 187# If you installed in $(DESTDIR), test-installed won't work until you
188# move the library to its final location. Use test-dd to test it 188# move the library to its final location. Use test-dd to test it
189# before then. 189# before then.
190 190
191test-dd: 191test-dd:
192 echo 192 echo
193 echo Testing installed dynamic shared library in $(DL). 193 echo Testing installed dynamic shared library in $(DL).
194 $(CC) -I$(DI) -I$(ZLIBINC) \ 194 $(CC) -I$(DI) -I$(ZLIBINC) \
195 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 195 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
196 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 196 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \
197 -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) 197 -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL)
198 ./pngtestd pngtest.png 198 ./pngtestd pngtest.png
199 199
200test-installed: 200test-installed:
201 echo 201 echo
202 echo Testing installed dynamic shared library. 202 echo Testing installed dynamic shared library.
203 $(CC) -I$(ZLIBINC) \ 203 $(CC) -I$(ZLIBINC) \
204 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 204 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
205 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 205 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
206 -L$(ZLIBLIB) -R$(ZLIBLIB) 206 -L$(ZLIBLIB) -R$(ZLIBLIB)
207 ./pngtesti pngtest.png 207 ./pngtesti pngtest.png
208 208
209clean: 209clean:
210 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ 210 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
211 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 211 libpng-config $(LIBSO) $(LIBSOMAJ)* \
212 libpng.pc pnglibconf.h 212 libpng.pc pnglibconf.h
213 213
214DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 214DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
215writelock: 215writelock:
216 chmod a-w *.[ch35] $(DOCS) scripts/* 216 chmod a-w *.[ch35] $(DOCS) scripts/*
217 217
218# DO NOT DELETE THIS LINE -- make depend depends on it. 218# DO NOT DELETE THIS LINE -- make depend depends on it.
219 219
220png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 220png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
221pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 221pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
222pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 222pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
223pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 223pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
224pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 224pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
225pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 227pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
228pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 228pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
229pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 229pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
230pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 230pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
231pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 231pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
232pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 232pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
233pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 233pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
234pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 234pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
235 235
236pngtest.o: png.h pngconf.h pnglibconf.h 236pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris-x86 b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris-x86
index 4a43e53..7646762 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris-x86
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.solaris-x86
@@ -1,236 +1,236 @@
1# makefile for libpng on Solaris 2.x with gcc 1# makefile for libpng on Solaris 2.x with gcc
2# Copyright (C) 2004, 2006-2008, 2010-2011 Glenn Randers-Pehrson 2# Copyright (C) 2004, 2006-2008, 2010-2011 Glenn Randers-Pehrson
3# Contributed by William L. Sebok, based on makefile.linux 3# Contributed by William L. Sebok, based on makefile.linux
4# Copyright (C) 1998 Greg Roelofs 4# Copyright (C) 1998 Greg Roelofs
5# Copyright (C) 1996, 1997 Andreas Dilger 5# Copyright (C) 1996, 1997 Andreas Dilger
6 6
7# This code is released under the libpng license. 7# This code is released under the libpng license.
8# For conditions of distribution and use, see the disclaimer 8# For conditions of distribution and use, see the disclaimer
9# and license in png.h 9# and license in png.h
10 10
11# Library name: 11# Library name:
12LIBNAME = libpng15 12LIBNAME = libpng15
13PNGMAJ = 15 13PNGMAJ = 15
14 14
15# Shared library names: 15# Shared library names:
16LIBSO=$(LIBNAME).so 16LIBSO=$(LIBNAME).so
17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) 17LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
18LIBSOREL=$(LIBSOMAJ).$(RELEASE) 18LIBSOREL=$(LIBSOMAJ).$(RELEASE)
19OLDSO=libpng.so 19OLDSO=libpng.so
20 20
21# Utilities: 21# Utilities:
22AR_RC=ar rc 22AR_RC=ar rc
23CC=gcc 23CC=gcc
24MKDIR_P=mkdir -p 24MKDIR_P=mkdir -p
25LN_SF=ln -f -s 25LN_SF=ln -f -s
26RANLIB=echo 26RANLIB=echo
27RM_F=/bin/rm -f 27RM_F=/bin/rm -f
28 28
29# Where make install puts libpng.a, libpng15.so*, and png.h 29# Where make install puts libpng.a, libpng15.so*, and png.h
30prefix=/usr/local 30prefix=/usr/local
31exec_prefix=$(prefix) 31exec_prefix=$(prefix)
32 32
33# Where the zlib library and include files are located 33# Where the zlib library and include files are located
34# Changing these to ../zlib poses a security risk. If you want 34# Changing these to ../zlib poses a security risk. If you want
35# to have zlib in an adjacent directory, specify the full path instead of "..". 35# to have zlib in an adjacent directory, specify the full path instead of "..".
36#ZLIBLIB=../zlib 36#ZLIBLIB=../zlib
37#ZLIBINC=../zlib 37#ZLIBINC=../zlib
38 38
39ZLIBLIB=/usr/local/lib 39ZLIBLIB=/usr/local/lib
40ZLIBINC=/usr/local/include 40ZLIBINC=/usr/local/include
41 41
42WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ 42WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
43 -Wmissing-declarations -Wtraditional -Wcast-align \ 43 -Wmissing-declarations -Wtraditional -Wcast-align \
44 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion 44 -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
45CFLAGS=-I$(ZLIBINC) -W -Wall -O \ 45CFLAGS=-I$(ZLIBINC) -W -Wall -O \
46 # $(WARNMORE) -g -DPNG_DEBUG=5 46 # $(WARNMORE) -g -DPNG_DEBUG=5
47LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm 47LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
48 48
49INCPATH=$(prefix)/include 49INCPATH=$(prefix)/include
50LIBPATH=$(exec_prefix)/lib 50LIBPATH=$(exec_prefix)/lib
51MANPATH=$(prefix)/man 51MANPATH=$(prefix)/man
52BINPATH=$(exec_prefix)/bin 52BINPATH=$(exec_prefix)/bin
53 53
54# override DESTDIR= on the make install command line to easily support 54# override DESTDIR= on the make install command line to easily support
55# installing into a temporary location. Example: 55# installing into a temporary location. Example:
56# 56#
57# make install DESTDIR=/tmp/build/libpng 57# make install DESTDIR=/tmp/build/libpng
58# 58#
59# If you're going to install into a temporary location 59# If you're going to install into a temporary location
60# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 60# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
61# you execute make install. 61# you execute make install.
62DESTDIR= 62DESTDIR=
63 63
64DB=$(DESTDIR)$(BINPATH) 64DB=$(DESTDIR)$(BINPATH)
65DI=$(DESTDIR)$(INCPATH) 65DI=$(DESTDIR)$(INCPATH)
66DL=$(DESTDIR)$(LIBPATH) 66DL=$(DESTDIR)$(LIBPATH)
67DM=$(DESTDIR)$(MANPATH) 67DM=$(DESTDIR)$(MANPATH)
68 68
69OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 69OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
70 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 70 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
71 pngwtran.o pngmem.o pngerror.o pngpread.o 71 pngwtran.o pngmem.o pngerror.o pngpread.o
72 72
73OBJSDLL = $(OBJS:.o=.pic.o) 73OBJSDLL = $(OBJS:.o=.pic.o)
74 74
75.SUFFIXES: .c .o .pic.o 75.SUFFIXES: .c .o .pic.o
76 76
77.c.pic.o: 77.c.pic.o:
78 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c 78 $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
79 79
80all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config 80all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
81 81
82# see scripts/pnglibconf.mak for more options 82# see scripts/pnglibconf.mak for more options
83pnglibconf.h: scripts/pnglibconf.h.prebuilt 83pnglibconf.h: scripts/pnglibconf.h.prebuilt
84 cp scripts/pnglibconf.h.prebuilt $@ 84 cp scripts/pnglibconf.h.prebuilt $@
85 85
86libpng.a: $(OBJS) 86libpng.a: $(OBJS)
87 $(AR_RC) $@ $(OBJS) 87 $(AR_RC) $@ $(OBJS)
88 $(RANLIB) $@ 88 $(RANLIB) $@
89 89
90libpng.pc: 90libpng.pc:
91 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ 91 cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
92 -e s!@exec_prefix@!$(exec_prefix)! \ 92 -e s!@exec_prefix@!$(exec_prefix)! \
93 -e s!@libdir@!$(LIBPATH)! \ 93 -e s!@libdir@!$(LIBPATH)! \
94 -e s!@includedir@!$(INCPATH)! \ 94 -e s!@includedir@!$(INCPATH)! \
95 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc 95 -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
96 96
97libpng-config: 97libpng-config:
98 ( cat scripts/libpng-config-head.in; \ 98 ( cat scripts/libpng-config-head.in; \
99 echo prefix=\"$(prefix)\"; \ 99 echo prefix=\"$(prefix)\"; \
100 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ 100 echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
101 echo cppflags=\""; \ 101 echo cppflags=\""; \
102 echo L_opts=\"-L$(LIBPATH)\"; \ 102 echo L_opts=\"-L$(LIBPATH)\"; \
103 echo R_opts=\"-R$(LIBPATH)\"; \ 103 echo R_opts=\"-R$(LIBPATH)\"; \
104 echo libs=\"-lpng15 -lz -lm\"; \ 104 echo libs=\"-lpng15 -lz -lm\"; \
105 cat scripts/libpng-config-body.in ) > libpng-config 105 cat scripts/libpng-config-body.in ) > libpng-config
106 chmod +x libpng-config 106 chmod +x libpng-config
107 107
108$(LIBSO): $(LIBSOMAJ) 108$(LIBSO): $(LIBSOMAJ)
109 $(LN_SF) $(LIBSOMAJ) $(LIBSO) 109 $(LN_SF) $(LIBSOMAJ) $(LIBSO)
110 110
111$(LIBSOMAJ): $(OBJSDLL) 111$(LIBSOMAJ): $(OBJSDLL)
112 @case "`type ld`" in *ucb*) \ 112 @case "`type ld`" in *ucb*) \
113 echo; \ 113 echo; \
114 echo '## WARNING:'; \ 114 echo '## WARNING:'; \
115 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \ 115 echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \
116 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \ 116 echo '## and /usr/ucb/ld. If they do, you need to adjust your PATH'; \
117 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \ 117 echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \
118 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \ 118 echo '## The environment variable LD_LIBRARY_PATH should not be set'; \
119 echo '## at all. If it is, things are likely to break because of'; \ 119 echo '## at all. If it is, things are likely to break because of'; \
120 echo '## the libucb dependency that is created.'; \ 120 echo '## the libucb dependency that is created.'; \
121 echo; \ 121 echo; \
122 ;; \ 122 ;; \
123 esac 123 esac
124 $(LD) -G -h $(LIBSOMAJ) \ 124 $(LD) -G -h $(LIBSOMAJ) \
125 -o $(LIBSOMAJ) $(OBJSDLL) 125 -o $(LIBSOMAJ) $(OBJSDLL)
126 126
127pngtest: pngtest.o $(LIBSO) 127pngtest: pngtest.o $(LIBSO)
128 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 128 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
129 129
130test: pngtest 130test: pngtest
131 ./pngtest 131 ./pngtest
132 132
133install-headers: png.h pngconf.h pnglibconf.h 133install-headers: png.h pngconf.h pnglibconf.h
134 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi 134 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
135 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi 135 -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
136 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME) 136 cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
137 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h 137 chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
138 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h 138 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
139 -@$(RM_F) $(DI)/libpng 139 -@$(RM_F) $(DI)/libpng
140 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) 140 (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
141 141
142install-static: install-headers libpng.a 142install-static: install-headers libpng.a
143 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 143 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
144 cp libpng.a $(DL)/$(LIBNAME).a 144 cp libpng.a $(DL)/$(LIBNAME).a
145 chmod 644 $(DL)/$(LIBNAME).a 145 chmod 644 $(DL)/$(LIBNAME).a
146 -@$(RM_F) $(DL)/libpng.a 146 -@$(RM_F) $(DL)/libpng.a
147 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) 147 (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
148 148
149install-shared: install-headers $(LIBSOMAJ) libpng.pc 149install-shared: install-headers $(LIBSOMAJ) libpng.pc
150 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi 150 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
151 -@$(RM_F) $(DL)/$(LIBSO) 151 -@$(RM_F) $(DL)/$(LIBSO)
152 -@$(RM_F) $(DL)/$(LIBSOREL) 152 -@$(RM_F) $(DL)/$(LIBSOREL)
153 -@$(RM_F) $(DL)/$(OLDSO) 153 -@$(RM_F) $(DL)/$(OLDSO)
154 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) 154 cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
155 chmod 755 $(DL)/$(LIBSOREL) 155 chmod 755 $(DL)/$(LIBSOREL)
156 (cd $(DL); \ 156 (cd $(DL); \
157 $(LN_SF) $(LIBSOREL) $(LIBSO); \ 157 $(LN_SF) $(LIBSOREL) $(LIBSO); \
158 $(LN_SF) $(LIBSO) $(OLDSO)) 158 $(LN_SF) $(LIBSO) $(OLDSO))
159 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi 159 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
160 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc 160 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
161 -@$(RM_F) $(DL)/pkgconfig/libpng.pc 161 -@$(RM_F) $(DL)/pkgconfig/libpng.pc
162 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc 162 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
163 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc 163 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
164 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) 164 (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
165 165
166install-man: libpng.3 libpngpf.3 png.5 166install-man: libpng.3 libpngpf.3 png.5
167 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi 167 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
168 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi 168 -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
169 -@$(RM_F) $(DM)/man3/libpng.3 169 -@$(RM_F) $(DM)/man3/libpng.3
170 -@$(RM_F) $(DM)/man3/libpngpf.3 170 -@$(RM_F) $(DM)/man3/libpngpf.3
171 cp libpng.3 $(DM)/man3 171 cp libpng.3 $(DM)/man3
172 cp libpngpf.3 $(DM)/man3 172 cp libpngpf.3 $(DM)/man3
173 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi 173 -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
174 -@$(RM_F) $(DM)/man5/png.5 174 -@$(RM_F) $(DM)/man5/png.5
175 cp png.5 $(DM)/man5 175 cp png.5 $(DM)/man5
176 176
177install-config: libpng-config 177install-config: libpng-config
178 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi 178 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
179 -@$(RM_F) $(DB)/libpng-config 179 -@$(RM_F) $(DB)/libpng-config
180 -@$(RM_F) $(DB)/$(LIBNAME)-config 180 -@$(RM_F) $(DB)/$(LIBNAME)-config
181 cp libpng-config $(DB)/$(LIBNAME)-config 181 cp libpng-config $(DB)/$(LIBNAME)-config
182 chmod 755 $(DB)/$(LIBNAME)-config 182 chmod 755 $(DB)/$(LIBNAME)-config
183 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) 183 (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
184 184
185install: install-static install-shared install-man install-config 185install: install-static install-shared install-man install-config
186 186
187# If you installed in $(DESTDIR), test-installed won't work until you 187# If you installed in $(DESTDIR), test-installed won't work until you
188# move the library to its final location. Use test-dd to test it 188# move the library to its final location. Use test-dd to test it
189# before then. 189# before then.
190 190
191test-dd: 191test-dd:
192 echo 192 echo
193 echo Testing installed dynamic shared library in $(DL). 193 echo Testing installed dynamic shared library in $(DL).
194 $(CC) -I$(DI) -I$(ZLIBINC) \ 194 $(CC) -I$(DI) -I$(ZLIBINC) \
195 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 195 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
196 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 196 -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \
197 -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) 197 -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL)
198 ./pngtestd pngtest.png 198 ./pngtestd pngtest.png
199 199
200test-installed: 200test-installed:
201 echo 201 echo
202 echo Testing installed dynamic shared library. 202 echo Testing installed dynamic shared library.
203 $(CC) -I$(ZLIBINC) \ 203 $(CC) -I$(ZLIBINC) \
204 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ 204 `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
205 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ 205 -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
206 -L$(ZLIBLIB) -R$(ZLIBLIB) 206 -L$(ZLIBLIB) -R$(ZLIBLIB)
207 ./pngtesti pngtest.png 207 ./pngtesti pngtest.png
208 208
209clean: 209clean:
210 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ 210 $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
211 libpng-config $(LIBSO) $(LIBSOMAJ)* \ 211 libpng-config $(LIBSO) $(LIBSOMAJ)* \
212 libpng.pc pnglibconf.h 212 libpng.pc pnglibconf.h
213 213
214DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 214DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
215writelock: 215writelock:
216 chmod a-w *.[ch35] $(DOCS) scripts/* 216 chmod a-w *.[ch35] $(DOCS) scripts/*
217 217
218# DO NOT DELETE THIS LINE -- make depend depends on it. 218# DO NOT DELETE THIS LINE -- make depend depends on it.
219 219
220png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 220png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
221pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 221pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
222pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 222pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
223pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 223pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
224pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 224pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
225pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 225pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
226pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 226pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
227pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 227pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
228pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 228pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
229pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 229pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
230pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 230pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
231pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 231pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
232pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 232pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
233pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 233pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
234pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 234pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
235 235
236pngtest.o: png.h pngconf.h pnglibconf.h 236pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.std b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.std
index d394f96..a04dbb8 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.std
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.std
@@ -1,123 +1,123 @@
1# makefile for libpng 1# makefile for libpng
2# Copyright (C) 2002, 2006 Glenn Randers-Pehrson 2# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# where make install puts libpng.a and png.h 9# where make install puts libpng.a and png.h
10prefix=/usr/local 10prefix=/usr/local
11INCPATH=$(prefix)/include 11INCPATH=$(prefix)/include
12LIBPATH=$(prefix)/lib 12LIBPATH=$(prefix)/lib
13 13
14# override DESTDIR= on the make install command line to easily support 14# override DESTDIR= on the make install command line to easily support
15# installing into a temporary location. Example: 15# installing into a temporary location. Example:
16# 16#
17# make install DESTDIR=/tmp/build/libpng 17# make install DESTDIR=/tmp/build/libpng
18# 18#
19# If you're going to install into a temporary location 19# If you're going to install into a temporary location
20# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 20# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
21# you execute make install. 21# you execute make install.
22DESTDIR= 22DESTDIR=
23 23
24# Where the zlib library and include files are located 24# Where the zlib library and include files are located
25#ZLIBLIB=/usr/local/lib 25#ZLIBLIB=/usr/local/lib
26#ZLIBINC=/usr/local/include 26#ZLIBINC=/usr/local/include
27ZLIBLIB=../zlib 27ZLIBLIB=../zlib
28ZLIBINC=../zlib 28ZLIBINC=../zlib
29 29
30CC=cc 30CC=cc
31AR_RC=ar rc 31AR_RC=ar rc
32MKDIR_P=mkdir 32MKDIR_P=mkdir
33LN_SF=ln -sf 33LN_SF=ln -sf
34RANLIB=ranlib 34RANLIB=ranlib
35RM_F=rm -f 35RM_F=rm -f
36AWK = awk 36AWK = awk
37SED = sed 37SED = sed
38CPP = $(CC) -E 38CPP = $(CC) -E
39ECHO = echo 39ECHO = echo
40 40
41DFNFLAGS = # DFNFLAGS contains -D options to use in the libpng build 41DFNFLAGS = # DFNFLAGS contains -D options to use in the libpng build
42CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 42CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
43LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm 43LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
44 44
45OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 45OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
46 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 46 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
47 pngwtran.o pngmem.o pngerror.o pngpread.o 47 pngwtran.o pngmem.o pngerror.o pngpread.o
48 48
49all: libpng.a pngtest 49all: libpng.a pngtest
50 50
51# The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt, 51# The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt,
52# copy this if the following doesn't work. 52# copy this if the following doesn't work.
53pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h 53pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
54 $(RM_F) $@ dfn?.out 54 $(RM_F) $@ dfn?.out
55 $(AWK) -f scripts/options.awk out=dfn1.out version=search pngconf.h\ 55 $(AWK) -f scripts/options.awk out=dfn1.out version=search pngconf.h\
56 scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2 56 scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
57 $(AWK) -f scripts/options.awk out=dfn2.out dfn1.out 1>&2 57 $(AWK) -f scripts/options.awk out=dfn2.out dfn1.out 1>&2
58 cp dfn2.out $@ 58 cp dfn2.out $@
59 $(RM_F) dfn?.out 59 $(RM_F) dfn?.out
60 60
61pnglibconf.h: pnglibconf.dfn 61pnglibconf.h: pnglibconf.dfn
62 $(RM_F) $@ dfn.c dfn?.out 62 $(RM_F) $@ dfn.c dfn?.out
63 $(ECHO) '#include "pnglibconf.dfn"' >dfn.c 63 $(ECHO) '#include "pnglibconf.dfn"' >dfn.c
64 $(CPP) $(DFNFLAGS) dfn.c >dfn1.out 64 $(CPP) $(DFNFLAGS) dfn.c >dfn1.out
65 $(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\ 65 $(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\
66 dfn1.out >dfn2.out 66 dfn1.out >dfn2.out
67 $(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out 67 $(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out
68 cp dfn3.out $@ 68 cp dfn3.out $@
69 $(RM_F) dfn.c dfn?.out 69 $(RM_F) dfn.c dfn?.out
70 70
71libpng.a: $(OBJS) 71libpng.a: $(OBJS)
72 $(AR_RC) $@ $(OBJS) 72 $(AR_RC) $@ $(OBJS)
73 $(RANLIB) $@ 73 $(RANLIB) $@
74 74
75pngtest: pngtest.o libpng.a 75pngtest: pngtest.o libpng.a
76 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 76 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
77 77
78test: pngtest 78test: pngtest
79 ./pngtest 79 ./pngtest
80 80
81install: libpng.a pnglibconf.h 81install: libpng.a pnglibconf.h
82 -@$(MKDIR_P) $(DESTDIR)$(INCPATH) 82 -@$(MKDIR_P) $(DESTDIR)$(INCPATH)
83 -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng 83 -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng
84 -@$(MKDIR_P) $(DESTDIR)$(LIBPATH) 84 -@$(MKDIR_P) $(DESTDIR)$(LIBPATH)
85 -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h 85 -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h
86 -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h 86 -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h
87 -@$(RM_F) $(DESTDIR)$(INCPATH)/pnglibconf.h 87 -@$(RM_F) $(DESTDIR)$(INCPATH)/pnglibconf.h
88 cp png.h $(DESTDIR)$(INCPATH)/libpng 88 cp png.h $(DESTDIR)$(INCPATH)/libpng
89 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng 89 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
90 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng 90 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
91 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h 91 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
92 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h 92 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
93 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h 93 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
94 (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .) 94 (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
95 cp libpng.a $(DESTDIR)$(LIBPATH) 95 cp libpng.a $(DESTDIR)$(LIBPATH)
96 chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a 96 chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
97 97
98clean: 98clean:
99 $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.* dfn.c dfn?.out 99 $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.* dfn.c dfn?.out
100 100
101DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 101DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
102writelock: 102writelock:
103 chmod a-w *.[ch35] $(DOCS) scripts/* 103 chmod a-w *.[ch35] $(DOCS) scripts/*
104 104
105# DO NOT DELETE THIS LINE -- make depend depends on it. 105# DO NOT DELETE THIS LINE -- make depend depends on it.
106 106
107png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 107png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
108pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 108pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
109pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 109pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
110pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 110pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
111pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 111pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
112pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 112pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
113pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 113pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
114pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 114pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
115pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 115pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
116pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 116pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
117pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 117pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
118pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 118pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
119pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 119pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
120pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 120pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
121pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 121pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
122 122
123pngtest.o: png.h pngconf.h pnglibconf.h 123pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sunos b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sunos
index 52cd4d4..3839549 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sunos
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.sunos
@@ -1,107 +1,107 @@
1# makefile for libpng 1# makefile for libpng
2# Copyright (C) 2002, 2006 Glenn Randers-Pehrson 2# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. 3# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
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# where make install puts libpng.a and png.h 9# where make install puts libpng.a and png.h
10prefix=/usr/local 10prefix=/usr/local
11INCPATH=$(prefix)/include 11INCPATH=$(prefix)/include
12LIBPATH=$(prefix)/lib 12LIBPATH=$(prefix)/lib
13 13
14# override DESTDIR= on the make install command line to easily support 14# override DESTDIR= on the make install command line to easily support
15# installing into a temporary location. Example: 15# installing into a temporary location. Example:
16# 16#
17# make install DESTDIR=/tmp/build/libpng 17# make install DESTDIR=/tmp/build/libpng
18# 18#
19# If you're going to install into a temporary location 19# If you're going to install into a temporary location
20# via DESTDIR, $(DESTDIR)$(prefix) must already exist before 20# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
21# you execute make install. 21# you execute make install.
22DESTDIR= 22DESTDIR=
23 23
24# Where the zlib library and include files are located 24# Where the zlib library and include files are located
25#ZLIBLIB=/usr/local/lib 25#ZLIBLIB=/usr/local/lib
26#ZLIBINC=/usr/local/include 26#ZLIBINC=/usr/local/include
27ZLIBLIB=../zlib 27ZLIBLIB=../zlib
28ZLIBINC=../zlib 28ZLIBINC=../zlib
29 29
30 30
31WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \ 31WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \
32 -Wmissing-declarations -Wtraditional -Wcast-align \ 32 -Wmissing-declarations -Wtraditional -Wcast-align \
33 -Wstrict-prototypes -Wmissing-prototypes 33 -Wstrict-prototypes -Wmissing-prototypes
34 34
35CC=gcc 35CC=gcc
36AR_RC=ar rc 36AR_RC=ar rc
37MKDIR_P=mkdir -p 37MKDIR_P=mkdir -p
38LN_SF=ln -f -s 38LN_SF=ln -f -s
39RANLIB=ranlib 39RANLIB=ranlib
40RM_F=/bin/rm -f 40RM_F=/bin/rm -f
41 41
42CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 42CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5
43LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm 43LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
44 44
45OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ 45OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
46 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ 46 pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
47 pngwtran.o pngmem.o pngerror.o pngpread.o 47 pngwtran.o pngmem.o pngerror.o pngpread.o
48 48
49all: libpng.a pngtest 49all: libpng.a pngtest
50 50
51# see scripts/pnglibconf.mak for more options 51# see scripts/pnglibconf.mak for more options
52pnglibconf.h: scripts/pnglibconf.h.prebuilt 52pnglibconf.h: scripts/pnglibconf.h.prebuilt
53 cp scripts/pnglibconf.h.prebuilt $@ 53 cp scripts/pnglibconf.h.prebuilt $@
54 54
55libpng.a: $(OBJS) 55libpng.a: $(OBJS)
56 $(AR_RC) $@ $(OBJS) 56 $(AR_RC) $@ $(OBJS)
57 $(RANLIB) $@ 57 $(RANLIB) $@
58 58
59pngtest: pngtest.o libpng.a 59pngtest: pngtest.o libpng.a
60 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) 60 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
61 61
62test: pngtest 62test: pngtest
63 ./pngtest 63 ./pngtest
64 64
65install: libpng.a 65install: libpng.a
66 -@$(MKDIR_P) $(DESTDIR)$(INCPATH) 66 -@$(MKDIR_P) $(DESTDIR)$(INCPATH)
67 -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng 67 -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng
68 -@$(MKDIR_P) $(DESTDIR)$(LIBPATH) 68 -@$(MKDIR_P) $(DESTDIR)$(LIBPATH)
69 -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h 69 -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h
70 -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h 70 -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h
71 -@$(RM_F) $(DESTDIR)$(INCPATH)/pnglibconf.h 71 -@$(RM_F) $(DESTDIR)$(INCPATH)/pnglibconf.h
72 cp png.h $(DESTDIR)$(INCPATH)/libpng 72 cp png.h $(DESTDIR)$(INCPATH)/libpng
73 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng 73 cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
74 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng 74 cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
75 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h 75 chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
76 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h 76 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
77 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h 77 chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
78 (cd $(DESTDIR)$(INCPATH); $(LN_SF) libpng/* .) 78 (cd $(DESTDIR)$(INCPATH); $(LN_SF) libpng/* .)
79 cp libpng.a $(DESTDIR)$(LIBPATH) 79 cp libpng.a $(DESTDIR)$(LIBPATH)
80 chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a 80 chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
81 81
82clean: 82clean:
83 $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h 83 $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h
84 84
85DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO 85DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
86writelock: 86writelock:
87 chmod a-w *.[ch35] $(DOCS) scripts/* 87 chmod a-w *.[ch35] $(DOCS) scripts/*
88 88
89# DO NOT DELETE THIS LINE -- make depend depends on it. 89# DO NOT DELETE THIS LINE -- make depend depends on it.
90 90
91png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 91png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
92pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 92pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
93pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 93pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
94pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 94pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
95pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 95pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
96pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 96pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
97pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 97pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
98pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 98pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
99pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 99pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
100pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 100pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
101pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 101pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
102pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 102pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
103pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 103pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
104pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 104pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
105pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 105pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
106 106
107pngtest.o: png.h pngconf.h pnglibconf.h 107pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.tc3 b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.tc3
index 311acfb..462c47f 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.tc3
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.tc3
@@ -1,93 +1,93 @@
1# Makefile for libpng 1# Makefile for libpng
2# TurboC/C++ (Note: All modules are compiled in C mode) 2# TurboC/C++ (Note: All modules are compiled in C mode)
3 3
4# To use, do "make -fmakefile.tc3" 4# To use, do "make -fmakefile.tc3"
5 5
6# ----- Turbo C 3.00 (can be modified to work with earlier versions) ----- 6# ----- Turbo C 3.00 (can be modified to work with earlier versions) -----
7 7
8MODEL=l 8MODEL=l
9CFLAGS=-O2 -Z -m$(MODEL) -I..\zlib 9CFLAGS=-O2 -Z -m$(MODEL) -I..\zlib
10#CFLAGS=-D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib # Turbo C older than 3.00 10#CFLAGS=-D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib # Turbo C older than 3.00
11CC=tcc 11CC=tcc
12LD=tcc 12LD=tcc
13LIB=tlib 13LIB=tlib
14LDFLAGS=-m$(MODEL) -L..\zlib 14LDFLAGS=-m$(MODEL) -L..\zlib
15O=.obj 15O=.obj
16E=.exe 16E=.exe
17 17
18# variables 18# variables
19OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) 19OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)
20OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) 20OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)
21OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) 21OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
22OBJSL1 = +png$(O) +pngset$(O) +pngget$(O) +pngrutil$(O) +pngtrans$(O) 22OBJSL1 = +png$(O) +pngset$(O) +pngget$(O) +pngrutil$(O) +pngtrans$(O)
23OBJSL2 = +pngwutil$(O) +pngmem$(O) +pngpread$(O) +pngread$(O) +pngerror$(O) 23OBJSL2 = +pngwutil$(O) +pngmem$(O) +pngpread$(O) +pngread$(O) +pngerror$(O)
24OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O) 24OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O)
25 25
26all: libpng$(MODEL).lib pngtest$(E) 26all: libpng$(MODEL).lib pngtest$(E)
27 27
28# see scripts/pnglibconf.mak for more options 28# see scripts/pnglibconf.mak for more options
29pnglibconf.h: scripts/pnglibconf.h.prebuilt 29pnglibconf.h: scripts/pnglibconf.h.prebuilt
30 cp scripts/pnglibconf.h.prebuilt $@ 30 cp scripts/pnglibconf.h.prebuilt $@
31 31
32pngtest: pngtest$(E) 32pngtest: pngtest$(E)
33 33
34test: pngtest$(E) 34test: pngtest$(E)
35 pngtest$(E) 35 pngtest$(E)
36 36
37png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 37png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
38 $(CC) -c $(CFLAGS) $*.c 38 $(CC) -c $(CFLAGS) $*.c
39 39
40pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 40pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
41 $(CC) -c $(CFLAGS) $*.c 41 $(CC) -c $(CFLAGS) $*.c
42 42
43pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 43pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
44 $(CC) -c $(CFLAGS) $*.c 44 $(CC) -c $(CFLAGS) $*.c
45 45
46pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 46pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
47 $(CC) -c $(CFLAGS) $*.c 47 $(CC) -c $(CFLAGS) $*.c
48 48
49pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 49pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
50 $(CC) -c $(CFLAGS) $*.c 50 $(CC) -c $(CFLAGS) $*.c
51 51
52pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 52pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
53 $(CC) -c $(CFLAGS) $*.c 53 $(CC) -c $(CFLAGS) $*.c
54 54
55pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 55pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
56 $(CC) -c $(CFLAGS) $*.c 56 $(CC) -c $(CFLAGS) $*.c
57 57
58pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 58pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
59 $(CC) -c $(CFLAGS) $*.c 59 $(CC) -c $(CFLAGS) $*.c
60 60
61pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 61pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
62 $(CC) -c $(CFLAGS) $*.c 62 $(CC) -c $(CFLAGS) $*.c
63 63
64pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 64pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
65 $(CC) -c $(CFLAGS) $*.c 65 $(CC) -c $(CFLAGS) $*.c
66 66
67pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 67pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
68 $(CC) -c $(CFLAGS) $*.c 68 $(CC) -c $(CFLAGS) $*.c
69 69
70pngtest$(O): png.h pngconf.h pnglibconf.h 70pngtest$(O): png.h pngconf.h pnglibconf.h
71 $(CC) -c $(CFLAGS) $*.c 71 $(CC) -c $(CFLAGS) $*.c
72 72
73pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 73pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
74 $(CC) -c $(CFLAGS) $*.c 74 $(CC) -c $(CFLAGS) $*.c
75 75
76pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 76pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
77 $(CC) -c $(CFLAGS) $*.c 77 $(CC) -c $(CFLAGS) $*.c
78 78
79pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 79pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
80 $(CC) -c $(CFLAGS) $*.c 80 $(CC) -c $(CFLAGS) $*.c
81 81
82pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 82pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
83 $(CC) -c $(CFLAGS) $*.c 83 $(CC) -c $(CFLAGS) $*.c
84 84
85libpng$(MODEL).lib: $(OBJS1) $(OBJS2) $(OBJS3) 85libpng$(MODEL).lib: $(OBJS1) $(OBJS2) $(OBJS3)
86 $(LIB) libpng$(MODEL) +$(OBJSL1) 86 $(LIB) libpng$(MODEL) +$(OBJSL1)
87 $(LIB) libpng$(MODEL) +$(OBJSL2) 87 $(LIB) libpng$(MODEL) +$(OBJSL2)
88 $(LIB) libpng$(MODEL) +$(OBJSL3) 88 $(LIB) libpng$(MODEL) +$(OBJSL3)
89 89
90pngtest$(E): pngtest$(O) libpng$(MODEL).lib 90pngtest$(E): pngtest$(O) libpng$(MODEL).lib
91 $(LD) $(LDFLAGS) pngtest.obj libpng$(MODEL).lib zlib_$(MODEL).lib 91 $(LD) $(LDFLAGS) pngtest.obj libpng$(MODEL).lib zlib_$(MODEL).lib
92 92
93# End of makefile for libpng 93# End of makefile for libpng
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.vcwin32 b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.vcwin32
index bdcc508..6bfeac0 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.vcwin32
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makefile.vcwin32
@@ -1,108 +1,108 @@
1# makefile for libpng 1# makefile for libpng
2# Copyright (C) 1998 Tim Wegner 2# Copyright (C) 1998 Tim Wegner
3# Copyright (C) 2006,2009,2011 Glenn Randers-Pehrson 3# Copyright (C) 2006,2009,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# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib 9# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
10# To use, do "nmake /f scripts\makefile.vcwin32" 10# To use, do "nmake /f scripts\makefile.vcwin32"
11 11
12# -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- 12# -------- Microsoft Visual C++ 2.0 and later, no assembler code --------
13 13
14# Compiler, linker, librarian, and other tools 14# Compiler, linker, librarian, and other tools
15CC = cl 15CC = cl
16LD = link 16LD = link
17AR = lib 17AR = lib
18CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -MD -O2 -W3 -I..\zlib 18CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -MD -O2 -W3 -I..\zlib
19LDFLAGS = -nologo 19LDFLAGS = -nologo
20ARFLAGS = -nologo 20ARFLAGS = -nologo
21RM = del 21RM = del
22 22
23# File extensions 23# File extensions
24O=.obj 24O=.obj
25 25
26#uncomment next to put error messages in a file 26#uncomment next to put error messages in a file
27#ERRFILE= >> pngerrs.log 27#ERRFILE= >> pngerrs.log
28 28
29# Variables 29# Variables
30OBJS1 = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) 30OBJS1 = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O)
31OBJS2 = pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) 31OBJS2 = pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O)
32OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) 32OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
33OBJS = $(OBJS1) $(OBJS2) $(OBJS3) 33OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
34 34
35# Targets 35# Targets
36all: libpng.lib 36all: libpng.lib
37 37
38# see scripts/pnglibconf.mak for more options 38# see scripts/pnglibconf.mak for more options
39pnglibconf.h: scripts\pnglibconf.h.prebuilt 39pnglibconf.h: scripts\pnglibconf.h.prebuilt
40 copy scripts\pnglibconf.h.prebuilt $@ 40 copy scripts\pnglibconf.h.prebuilt $@
41 41
42png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 42png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
43 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 43 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
44 44
45pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 45pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
46 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 46 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
47 47
48pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 48pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
49 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 49 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
50 50
51pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 51pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
52 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 52 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
53 53
54pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 54pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
55 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 55 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
56 56
57pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 57pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
58 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 58 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
59 59
60pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 60pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
61 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 61 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
62 62
63pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 63pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
64 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 64 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
65 65
66pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 66pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
67 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 67 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
68 68
69pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 69pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
70 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 70 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
71 71
72pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 72pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
73 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 73 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
74 74
75pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 75pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
76 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 76 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
77 77
78pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 78pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
79 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 79 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
80 80
81pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 81pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
82 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 82 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
83 83
84pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 84pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
85 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 85 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
86 86
87libpng.lib: $(OBJS) 87libpng.lib: $(OBJS)
88 -$(RM) $@ 88 -$(RM) $@
89 $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE) 89 $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
90 90
91pngtest$(O): png.h pngconf.h pnglibconf.h 91pngtest$(O): png.h pngconf.h pnglibconf.h
92 $(CC) -c $(CFLAGS) $*.c $(ERRFILE) 92 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
93 93
94pngtest.exe: pngtest$(O) libpng.lib 94pngtest.exe: pngtest$(O) libpng.lib
95 $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE) 95 $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
96 96
97test: pngtest.exe 97test: pngtest.exe
98 pngtest 98 pngtest
99 99
100clean: 100clean:
101 -$(RM) *$(O) 101 -$(RM) *$(O)
102 -$(RM) libpng.lib 102 -$(RM) libpng.lib
103 -$(RM) pnglibconf.h 103 -$(RM) pnglibconf.h
104 -$(RM) pngtest.exe 104 -$(RM) pngtest.exe
105 -$(RM) pngout.png 105 -$(RM) pngout.png
106 106
107# End of makefile for libpng 107# End of makefile for libpng
108 108
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makevms.com b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makevms.com
index 6563684..f6c3261 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makevms.com
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/makevms.com
@@ -1,142 +1,142 @@
1$! make libpng under VMS 1$! make libpng under VMS
2$! 2$!
3$! 3$!
4$! Check for MMK/MMS 4$! Check for MMK/MMS
5$! 5$!
6$! This procedure accepts one parameter (contrib), which causes it to build 6$! This procedure accepts one parameter (contrib), which causes it to build
7$! the programs from the contrib directory instead of libpng. 7$! the programs from the contrib directory instead of libpng.
8$! 8$!
9$ p1 = f$edit(p1,"UPCASE") 9$ p1 = f$edit(p1,"UPCASE")
10$ if p1 .eqs. "CONTRIB" 10$ if p1 .eqs. "CONTRIB"
11$ then 11$ then
12$ set def [.contrib.gregbook] 12$ set def [.contrib.gregbook]
13$ @makevms 13$ @makevms
14$ set def [-.pngminus] 14$ set def [-.pngminus]
15$ @makevms 15$ @makevms
16$ set def [--] 16$ set def [--]
17$ exit 17$ exit
18$ endif 18$ endif
19$ Make = "" 19$ Make = ""
20$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS" 20$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
21$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK" 21$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
22$! 22$!
23$! Look for the compiler used 23$! Look for the compiler used
24$! 24$!
25$ zlibsrc = "[-.zlib]" 25$ zlibsrc = "[-.zlib]"
26$ ccopt="/include=''zlibsrc'" 26$ ccopt="/include=''zlibsrc'"
27$ if f$getsyi("HW_MODEL").ge.1024 27$ if f$getsyi("HW_MODEL").ge.1024
28$ then 28$ then
29$ ccopt = "/prefix=all"+ccopt 29$ ccopt = "/prefix=all"+ccopt
30$ comp = "__decc__=1" 30$ comp = "__decc__=1"
31$ if f$trnlnm("SYS").eqs."" then define sys sys$library: 31$ if f$trnlnm("SYS").eqs."" then define sys sys$library:
32$ else 32$ else
33$ if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs."" 33$ if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs.""
34$ then 34$ then
35$ if f$trnlnm("SYS").eqs."" then define sys sys$library: 35$ if f$trnlnm("SYS").eqs."" then define sys sys$library:
36$ if f$search("SYS$SYSTEM:VAXC.EXE").eqs."" 36$ if f$search("SYS$SYSTEM:VAXC.EXE").eqs.""
37$ then 37$ then
38$ comp = "__gcc__=1" 38$ comp = "__gcc__=1"
39$ CC :== GCC 39$ CC :== GCC
40$ else 40$ else
41$ comp = "__vaxc__=1" 41$ comp = "__vaxc__=1"
42$ endif 42$ endif
43$ else 43$ else
44$ if f$trnlnm("SYS").eqs."" then define sys decc$library_include: 44$ if f$trnlnm("SYS").eqs."" then define sys decc$library_include:
45$ ccopt = "/decc/prefix=all"+ccopt 45$ ccopt = "/decc/prefix=all"+ccopt
46$ comp = "__decc__=1" 46$ comp = "__decc__=1"
47$ endif 47$ endif
48$ endif 48$ endif
49$! 49$!
50$! Build the thing plain or with mms/mmk 50$! Build the thing plain or with mms/mmk
51$! 51$!
52$ write sys$output "Compiling Libpng sources ..." 52$ write sys$output "Compiling Libpng sources ..."
53$ if make.eqs."" 53$ if make.eqs.""
54$ then 54$ then
55$ dele pngtest.obj;* 55$ dele pngtest.obj;*
56$ CALL MAKE png.OBJ "cc ''CCOPT' png" - 56$ CALL MAKE png.OBJ "cc ''CCOPT' png" -
57 png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 57 png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
58$ CALL MAKE pngset.OBJ "cc ''CCOPT' pngset" - 58$ CALL MAKE pngset.OBJ "cc ''CCOPT' pngset" -
59 pngset.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 59 pngset.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
60$ CALL MAKE pngget.OBJ "cc ''CCOPT' pngget" - 60$ CALL MAKE pngget.OBJ "cc ''CCOPT' pngget" -
61 pngget.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 61 pngget.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
62$ CALL MAKE pngread.OBJ "cc ''CCOPT' pngread" - 62$ CALL MAKE pngread.OBJ "cc ''CCOPT' pngread" -
63 pngread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 63 pngread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
64$ CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" - 64$ CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" -
65 pngpread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 65 pngpread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
66$ CALL MAKE pngrtran.OBJ "cc ''CCOPT' pngrtran" - 66$ CALL MAKE pngrtran.OBJ "cc ''CCOPT' pngrtran" -
67 pngrtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 67 pngrtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
68$ CALL MAKE pngrutil.OBJ "cc ''CCOPT' pngrutil" - 68$ CALL MAKE pngrutil.OBJ "cc ''CCOPT' pngrutil" -
69 pngrutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 69 pngrutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
70$ CALL MAKE pngerror.OBJ "cc ''CCOPT' pngerror" - 70$ CALL MAKE pngerror.OBJ "cc ''CCOPT' pngerror" -
71 pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 71 pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
72$ CALL MAKE pngmem.OBJ "cc ''CCOPT' pngmem" - 72$ CALL MAKE pngmem.OBJ "cc ''CCOPT' pngmem" -
73 pngmem.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 73 pngmem.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
74$ CALL MAKE pngrio.OBJ "cc ''CCOPT' pngrio" - 74$ CALL MAKE pngrio.OBJ "cc ''CCOPT' pngrio" -
75 pngrio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 75 pngrio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
76$ CALL MAKE pngwio.OBJ "cc ''CCOPT' pngwio" - 76$ CALL MAKE pngwio.OBJ "cc ''CCOPT' pngwio" -
77 pngwio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 77 pngwio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
78$ CALL MAKE pngtrans.OBJ "cc ''CCOPT' pngtrans" - 78$ CALL MAKE pngtrans.OBJ "cc ''CCOPT' pngtrans" -
79 pngtrans.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 79 pngtrans.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
80$ CALL MAKE pngwrite.OBJ "cc ''CCOPT' pngwrite" - 80$ CALL MAKE pngwrite.OBJ "cc ''CCOPT' pngwrite" -
81 pngwrite.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 81 pngwrite.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
82$ CALL MAKE pngwtran.OBJ "cc ''CCOPT' pngwtran" - 82$ CALL MAKE pngwtran.OBJ "cc ''CCOPT' pngwtran" -
83 pngwtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 83 pngwtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
84$ CALL MAKE pngwutil.OBJ "cc ''CCOPT' pngwutil" - 84$ CALL MAKE pngwutil.OBJ "cc ''CCOPT' pngwutil" -
85 pngwutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h 85 pngwutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
86$ write sys$output "Building Libpng ..." 86$ write sys$output "Building Libpng ..."
87$ CALL MAKE libpng.OLB "lib/crea libpng.olb *.obj" *.OBJ 87$ CALL MAKE libpng.OLB "lib/crea libpng.olb *.obj" *.OBJ
88$ write sys$output "Building pngtest..." 88$ write sys$output "Building pngtest..."
89$ CALL MAKE pngtest.OBJ "cc ''CCOPT' pngtest" - 89$ CALL MAKE pngtest.OBJ "cc ''CCOPT' pngtest" -
90 pngtest.c png.h pngconf.h pnglibconf.h 90 pngtest.c png.h pngconf.h pnglibconf.h
91$ call make pngtest.exe - 91$ call make pngtest.exe -
92 "LINK pngtest,libpng.olb/lib,''zlibsrc'libz.olb/lib" - 92 "LINK pngtest,libpng.olb/lib,''zlibsrc'libz.olb/lib" -
93 pngtest.obj libpng.olb 93 pngtest.obj libpng.olb
94$ write sys$output "Testing Libpng..." 94$ write sys$output "Testing Libpng..."
95$ run pngtest 95$ run pngtest
96$ else 96$ else
97$ if f$search("DESCRIP.MMS") .eqs. "" then copy/nolog [.SCRIPTS]DESCRIP.MMS [] 97$ if f$search("DESCRIP.MMS") .eqs. "" then copy/nolog [.SCRIPTS]DESCRIP.MMS []
98$ 'make'/macro=('comp',zlibsrc='zlibsrc') 98$ 'make'/macro=('comp',zlibsrc='zlibsrc')
99$ endif 99$ endif
100$ write sys$output "Libpng build completed" 100$ write sys$output "Libpng build completed"
101$ exit 101$ exit
102$! 102$!
103$! 103$!
104$MAKE: SUBROUTINE !SUBROUTINE TO CHECK DEPENDENCIES 104$MAKE: SUBROUTINE !SUBROUTINE TO CHECK DEPENDENCIES
105$ V = 'F$Verify(0) 105$ V = 'F$Verify(0)
106$! P1 = What we are trying to make 106$! P1 = What we are trying to make
107$! P2 = Command to make it 107$! P2 = Command to make it
108$! P3 - P8 What it depends on 108$! P3 - P8 What it depends on
109$ 109$
110$ If F$Search(P1) .Eqs. "" Then Goto Makeit 110$ If F$Search(P1) .Eqs. "" Then Goto Makeit
111$ Time = F$CvTime(F$File(P1,"RDT")) 111$ Time = F$CvTime(F$File(P1,"RDT"))
112$arg=3 112$arg=3
113$Loop: 113$Loop:
114$ Argument = P'arg 114$ Argument = P'arg
115$ If Argument .Eqs. "" Then Goto Exit 115$ If Argument .Eqs. "" Then Goto Exit
116$ El=0 116$ El=0
117$Loop2: 117$Loop2:
118$ File = F$Element(El," ",Argument) 118$ File = F$Element(El," ",Argument)
119$ If File .Eqs. " " Then Goto Endl 119$ If File .Eqs. " " Then Goto Endl
120$ AFile = "" 120$ AFile = ""
121$Loop3: 121$Loop3:
122$ OFile = AFile 122$ OFile = AFile
123$ AFile = F$Search(File) 123$ AFile = F$Search(File)
124$ If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl 124$ If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
125$ If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit 125$ If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
126$ Goto Loop3 126$ Goto Loop3
127$NextEL: 127$NextEL:
128$ El = El + 1 128$ El = El + 1
129$ Goto Loop2 129$ Goto Loop2
130$EndL: 130$EndL:
131$ arg=arg+1 131$ arg=arg+1
132$ If arg .Le. 8 Then Goto Loop 132$ If arg .Le. 8 Then Goto Loop
133$ Goto Exit 133$ Goto Exit
134$ 134$
135$Makeit: 135$Makeit:
136$ VV=F$VERIFY(0) 136$ VV=F$VERIFY(0)
137$ write sys$output P2 137$ write sys$output P2
138$ 'P2 138$ 'P2
139$ VV='F$Verify(VV) 139$ VV='F$Verify(VV)
140$Exit: 140$Exit:
141$ If V Then Set Verify 141$ If V Then Set Verify
142$ENDSUBROUTINE 142$ENDSUBROUTINE
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/options.awk b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/options.awk
index 29ea31d..a8dff04 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/options.awk
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/options.awk
@@ -1,777 +1,777 @@
1#!/bin/awk -f 1#!/bin/awk -f
2# scripts/options.awk - library build configuration control 2# scripts/options.awk - library build configuration control
3# 3#
4# last changed in libpng version 1.5.7 - December 15, 2011 4# last changed in libpng version 1.5.7 - December 15, 2011
5# 5#
6# Copyright (c) 1998-2011 Glenn Randers-Pehrson 6# Copyright (c) 1998-2011 Glenn Randers-Pehrson
7# 7#
8# This code is released under the libpng license. 8# This code is released under the libpng license.
9# For conditions of distribution and use, see the disclaimer 9# For conditions of distribution and use, see the disclaimer
10# and license in png.h 10# and license in png.h
11 11
12# The output of this script is written to the file given by 12# The output of this script is written to the file given by
13# the variable 'out'. The script is run twice, once with 13# the variable 'out'. The script is run twice, once with
14# an intermediate output file, 'options.tmp' then again on 14# an intermediate output file, 'options.tmp' then again on
15# that file to produce the final output: 15# that file to produce the final output:
16# 16#
17# awk -f scripts/options.awk out=options.tmp scripts/options.dfa 1>&2 17# awk -f scripts/options.awk out=options.tmp scripts/options.dfa 1>&2
18# awk -f scripts/options.awk out=options.dfn options.tmp 1>&2 18# awk -f scripts/options.awk out=options.dfn options.tmp 1>&2
19# 19#
20# Some options may be specified on the command line: 20# Some options may be specified on the command line:
21# 21#
22# deb=1 Causes debugging to be output 22# deb=1 Causes debugging to be output
23# logunsupported=1 Causes all options to be recorded in the output 23# logunsupported=1 Causes all options to be recorded in the output
24# everything=off Causes all options to be disabled by default 24# everything=off Causes all options to be disabled by default
25# everything=on Causes all options to be enabled by default 25# everything=on Causes all options to be enabled by default
26# 26#
27# If awk fails on your platform, try nawk instead. 27# If awk fails on your platform, try nawk instead.
28# 28#
29# These options may also be specified in the original input file (and 29# These options may also be specified in the original input file (and
30# are copied to the preprocessed file). 30# are copied to the preprocessed file).
31 31
32BEGIN{ 32BEGIN{
33 out="/dev/null" # intermediate, preprocessed, file 33 out="/dev/null" # intermediate, preprocessed, file
34 pre=-1 # preprocess (first line) 34 pre=-1 # preprocess (first line)
35 version="libpng version unknown" # version information 35 version="libpng version unknown" # version information
36 version_file="" # where to find the version 36 version_file="" # where to find the version
37 err=0 # in-line exit sets this 37 err=0 # in-line exit sets this
38 start="PNG_DEFN_MAGIC-" # Arbitrary start 38 start="PNG_DEFN_MAGIC-" # Arbitrary start
39 end="-PNG_DEFN_END" # Arbitrary end 39 end="-PNG_DEFN_END" # Arbitrary end
40 ct="PNG_JOIN" # Join two tokens 40 ct="PNG_JOIN" # Join two tokens
41 cx= "/" ct "*" # Open C comment for output file 41 cx= "/" ct "*" # Open C comment for output file
42 comment=start cx # Comment start 42 comment=start cx # Comment start
43 cend="*/" end # Comment end 43 cend="*/" end # Comment end
44 def=start "#define PNG_" ct # Arbitrary define 44 def=start "#define PNG_" ct # Arbitrary define
45 sup=ct "_SUPPORTED" end # end supported option 45 sup=ct "_SUPPORTED" end # end supported option
46 und=comment "#undef PNG_" ct # Unsupported option 46 und=comment "#undef PNG_" ct # Unsupported option
47 une=ct "_SUPPORTED" cend # end unsupported option 47 une=ct "_SUPPORTED" cend # end unsupported option
48 error=start "ERROR:" # error message 48 error=start "ERROR:" # error message
49 49
50 # Variables 50 # Variables
51 deb=0 # debug - set on command line 51 deb=0 # debug - set on command line
52 everything="" # do not override defaults 52 everything="" # do not override defaults
53 logunsupported=0 # write unsupported options too 53 logunsupported=0 # write unsupported options too
54 54
55 # Precreate arrays 55 # Precreate arrays
56 option[""] = "" # list of all options: default enabled/disabled 56 option[""] = "" # list of all options: default enabled/disabled
57 done[""] = 1 # marks option as having been output 57 done[""] = 1 # marks option as having been output
58 requires[""] = "" # requires by option 58 requires[""] = "" # requires by option
59 iffs[""] = "" # if by option 59 iffs[""] = "" # if by option
60 enabledby[""] = "" # options that enable it by option 60 enabledby[""] = "" # options that enable it by option
61 setting[""] = "" # requires by setting 61 setting[""] = "" # requires by setting
62 defaults[""] = "" # used for a defaulted value 62 defaults[""] = "" # used for a defaulted value
63 doneset[""] = 1 # marks setting as having been output 63 doneset[""] = 1 # marks setting as having been output
64 r[""] = "" # Temporary array 64 r[""] = "" # Temporary array
65 65
66 # For decorating the output file 66 # For decorating the output file
67 protect = "" 67 protect = ""
68} 68}
69 69
70# The output file must be specified before any input: 70# The output file must be specified before any input:
71out == "/dev/null" { 71out == "/dev/null" {
72 print "out=output.file must be given on the command line" 72 print "out=output.file must be given on the command line"
73 err = 1 73 err = 1
74 exit 1 74 exit 1
75} 75}
76 76
77# The very first line indicates whether we are reading pre-processed 77# The very first line indicates whether we are reading pre-processed
78# input or not, this must come *first* because 'PREPROCESSED' needs 78# input or not, this must come *first* because 'PREPROCESSED' needs
79# to be the very first line in the temporary file. 79# to be the very first line in the temporary file.
80pre == -1{ 80pre == -1{
81 if ($0 == "PREPROCESSED") { 81 if ($0 == "PREPROCESSED") {
82 pre = 0 82 pre = 0
83 next 83 next
84 } else { 84 } else {
85 pre = 1 85 pre = 1
86 print "PREPROCESSED" >out 86 print "PREPROCESSED" >out
87 # And fall through to continue processing 87 # And fall through to continue processing
88 } 88 }
89} 89}
90 90
91# While pre-processing if version is set to "search" look for a version string 91# While pre-processing if version is set to "search" look for a version string
92# in the following file. 92# in the following file.
93pre && version == "search" && version_file == ""{ 93pre && version == "search" && version_file == ""{
94 version_file = FILENAME 94 version_file = FILENAME
95} 95}
96 96
97pre && version == "search" && version_file != FILENAME{ 97pre && version == "search" && version_file != FILENAME{
98 print "version string not found in", version_file 98 print "version string not found in", version_file
99 err = 1 99 err = 1
100 exit 1 100 exit 1
101} 101}
102 102
103pre && version == "search" && $0 ~ /^ \* libpng version/{ 103pre && version == "search" && $0 ~ /^ \* libpng version/{
104 version = substr($0, 4) 104 version = substr($0, 4)
105 print "version =", version >out 105 print "version =", version >out
106 next 106 next
107} 107}
108 108
109pre && FILENAME == version_file{ 109pre && FILENAME == version_file{
110 next 110 next
111} 111}
112 112
113# variable=value 113# variable=value
114# Sets the given variable to the given value (the syntax is fairly 114# Sets the given variable to the given value (the syntax is fairly
115# free form, except for deb (you are expected to understand how to 115# free form, except for deb (you are expected to understand how to
116# set the debug variable...) 116# set the debug variable...)
117# 117#
118# This happens before the check on 'pre' below skips most of the 118# This happens before the check on 'pre' below skips most of the
119# rest of the actions, so the variable settings happen during 119# rest of the actions, so the variable settings happen during
120# preprocessing but are recorded in the END action too. This 120# preprocessing but are recorded in the END action too. This
121# allows them to be set on the command line too. 121# allows them to be set on the command line too.
122$0 ~ /^[ ]*version[ ]*=/{ 122$0 ~ /^[ ]*version[ ]*=/{
123 sub(/^[ ]*version[ ]*=[ ]*/, "") 123 sub(/^[ ]*version[ ]*=[ ]*/, "")
124 version = $0 124 version = $0
125 next 125 next
126} 126}
127$0 ~ /^[ ]*everything[ =]*off[ ]*$/{ 127$0 ~ /^[ ]*everything[ =]*off[ ]*$/{
128 everything = "off" 128 everything = "off"
129 next 129 next
130} 130}
131$0 ~ /^[ ]*everything[ =]*on[ ]*$/{ 131$0 ~ /^[ ]*everything[ =]*on[ ]*$/{
132 everything = "on" 132 everything = "on"
133 next 133 next
134} 134}
135$0 ~ /^[ ]*logunsupported[ =]*0[ ]*$/{ 135$0 ~ /^[ ]*logunsupported[ =]*0[ ]*$/{
136 logunsupported = 0 136 logunsupported = 0
137 next 137 next
138} 138}
139$0 ~ /^[ ]*logunsupported[ =]*1[ ]*$/{ 139$0 ~ /^[ ]*logunsupported[ =]*1[ ]*$/{
140 logunsupported = 1 140 logunsupported = 1
141 next 141 next
142} 142}
143$1 == "deb" && $2 == "=" && NF == 3{ 143$1 == "deb" && $2 == "=" && NF == 3{
144 deb = $3 144 deb = $3
145 next 145 next
146} 146}
147 147
148# Preprocessing - this just copies the input file with lines 148# Preprocessing - this just copies the input file with lines
149# that need preprocessing (just chunk at present) expanded 149# that need preprocessing (just chunk at present) expanded
150# The bare "pre" instead of "pre != 0" crashes under Sunos awk 150# The bare "pre" instead of "pre != 0" crashes under Sunos awk
151pre && $1 != "chunk"{ 151pre && $1 != "chunk"{
152 print >out 152 print >out
153 next 153 next
154} 154}
155 155
156# The first characters of the line determine how it is processed, 156# The first characters of the line determine how it is processed,
157# leading spaces are ignored. In general tokens that are not 157# leading spaces are ignored. In general tokens that are not
158# keywords are the names of options. An option 'name' is 158# keywords are the names of options. An option 'name' is
159# controlled by the definition of the corresponding macros: 159# controlled by the definition of the corresponding macros:
160# 160#
161# PNG_name_SUPPORTED The option is turned on 161# PNG_name_SUPPORTED The option is turned on
162# PNG_NO_name 162# PNG_NO_name
163# PNG_NO_name_SUPPORTED If the first macro is not defined 163# PNG_NO_name_SUPPORTED If the first macro is not defined
164# either of these will turn the option off 164# either of these will turn the option off
165# 165#
166# If none of these macros are defined the option is turned on, unless 166# If none of these macros are defined the option is turned on, unless
167# the keyword 'off' is given in a line relating to the option. The 167# the keyword 'off' is given in a line relating to the option. The
168# keyword 'on' can also be given, but it will be ignored (since it is 168# keyword 'on' can also be given, but it will be ignored (since it is
169# the default.) 169# the default.)
170# 170#
171# In the syntax below a 'name' is indicated by "NAME", other macro 171# In the syntax below a 'name' is indicated by "NAME", other macro
172# values are indicated by "MACRO", as with "NAME" the leading "PNG_" 172# values are indicated by "MACRO", as with "NAME" the leading "PNG_"
173# is omitted, but in this case the "NO_" prefix and the "_SUPPORTED" 173# is omitted, but in this case the "NO_" prefix and the "_SUPPORTED"
174# suffix are never used. 174# suffix are never used.
175# 175#
176# Each line is introduced by a keyword - the first non-space characters 176# Each line is introduced by a keyword - the first non-space characters
177# on the line. A line starting with a '#' is a comment - it is totally 177# on the line. A line starting with a '#' is a comment - it is totally
178# ignored. Keywords are as follows, a NAME, is simply a macro name 178# ignored. Keywords are as follows, a NAME, is simply a macro name
179# without the leading PNG_, PNG_NO_ or the trailing _SUPPORTED. 179# without the leading PNG_, PNG_NO_ or the trailing _SUPPORTED.
180 180
181$1 ~ /^#/ || $0 ~ /^[ ]*$/{ 181$1 ~ /^#/ || $0 ~ /^[ ]*$/{
182 next 182 next
183} 183}
184 184
185# com <comment> 185# com <comment>
186# The whole line is placed in the output file as a comment with 186# The whole line is placed in the output file as a comment with
187# the preceding 'com' removed 187# the preceding 'com' removed
188$1 == "com"{ 188$1 == "com"{
189 if (NF > 1) { 189 if (NF > 1) {
190 # sub(/^[ ]*com[ ]*/, "") 190 # sub(/^[ ]*com[ ]*/, "")
191 $1 = "" 191 $1 = ""
192 print comment, $0, cend >out 192 print comment, $0, cend >out
193 } else 193 } else
194 print start end >out 194 print start end >out
195 next 195 next
196} 196}
197 197
198# version 198# version
199# Inserts a version comment 199# Inserts a version comment
200$1 == "version" && NF == 1{ 200$1 == "version" && NF == 1{
201 if (version == "") { 201 if (version == "") {
202 print "ERROR: no version string set" 202 print "ERROR: no version string set"
203 err = 1 # prevent END{} running 203 err = 1 # prevent END{} running
204 exit 1 204 exit 1
205 } 205 }
206 206
207 print comment, version, cend >out 207 print comment, version, cend >out
208 next 208 next
209} 209}
210 210
211# file output input protect 211# file output input protect
212# Informational: the official name of the input file (without 212# Informational: the official name of the input file (without
213# make generated local directories), the official name of the 213# make generated local directories), the official name of the
214# output file and, if required, a name to use in a protection 214# output file and, if required, a name to use in a protection
215# macro for the contents. 215# macro for the contents.
216$1 == "file" && NF >= 2{ 216$1 == "file" && NF >= 2{
217 print comment, $2, cend >out 217 print comment, $2, cend >out
218 print comment, "Machine generated file: DO NOT EDIT", cend >out 218 print comment, "Machine generated file: DO NOT EDIT", cend >out
219 if (NF >= 3) 219 if (NF >= 3)
220 print comment, "Derived from:", $3, cend >out 220 print comment, "Derived from:", $3, cend >out
221 protect = $4 221 protect = $4
222 if (protect != "") { 222 if (protect != "") {
223 print start "#ifndef", protect end >out 223 print start "#ifndef", protect end >out
224 print start "#define", protect end >out 224 print start "#define", protect end >out
225 } 225 }
226 next 226 next
227} 227}
228 228
229# option NAME ( (requires|enables|if) NAME* | on | off | disabled )* 229# option NAME ( (requires|enables|if) NAME* | on | off | disabled )*
230# Declares an option 'NAME' and describes its default setting (disabled) 230# Declares an option 'NAME' and describes its default setting (disabled)
231# and its relationship to other options. The option is disabled 231# and its relationship to other options. The option is disabled
232# unless *all* the options listed after 'requires' are set and at 232# unless *all* the options listed after 'requires' are set and at
233# least one of the options listed after 'if' is set. If the 233# least one of the options listed after 'if' is set. If the
234# option is set then it turns on all the options listed after 'enables'. 234# option is set then it turns on all the options listed after 'enables'.
235# 235#
236# Note that "enables" takes priority over the required/if/disabled/off 236# Note that "enables" takes priority over the required/if/disabled/off
237# setting of the target option. 237# setting of the target option.
238# 238#
239# The definition file may list an option as 'disabled': off by default, 239# The definition file may list an option as 'disabled': off by default,
240# otherwise the option is enabled: on by default. A later (and it must 240# otherwise the option is enabled: on by default. A later (and it must
241# be later) entry may turn an option on or off explicitly. 241# be later) entry may turn an option on or off explicitly.
242 242
243$1 == "option" && NF >= 2{ 243$1 == "option" && NF >= 2{
244 onoff = option[$2] # records current (and the default is "", enabled) 244 onoff = option[$2] # records current (and the default is "", enabled)
245 key = "" 245 key = ""
246 for (i=3; i<=NF; ++i) { 246 for (i=3; i<=NF; ++i) {
247 if ($(i) == "on" || $(i) == "off" || $(i) == "disabled") { 247 if ($(i) == "on" || $(i) == "off" || $(i) == "disabled") {
248 key = "" 248 key = ""
249 if (onoff != $(i)) { 249 if (onoff != $(i)) {
250 # on or off can zap disabled or enabled: 250 # on or off can zap disabled or enabled:
251 if (onoff == "" || (onoff == "disabled" || onoff == "enabled") && ($(i) == "on" || $(i) == "off")) { 251 if (onoff == "" || (onoff == "disabled" || onoff == "enabled") && ($(i) == "on" || $(i) == "off")) {
252 # It's easy to mis-spell the option when turning it 252 # It's easy to mis-spell the option when turning it
253 # on or off, so warn about it here: 253 # on or off, so warn about it here:
254 if (onoff == "" && ($(i) == "on" || $(i) == "off")) { 254 if (onoff == "" && ($(i) == "on" || $(i) == "off")) {
255 print $2 ": ERROR: turning unrecognized option", $(i) 255 print $2 ": ERROR: turning unrecognized option", $(i)
256 # For the moment error out - it is safer 256 # For the moment error out - it is safer
257 err = 1 # prevent END{} running 257 err = 1 # prevent END{} running
258 exit 1 258 exit 1
259 } 259 }
260 onoff = $(i) 260 onoff = $(i)
261 } else { 261 } else {
262 # Print a message, otherwise the error 262 # Print a message, otherwise the error
263 # below is incomprehensible 263 # below is incomprehensible
264 print $2 ": currently", onoff ": attempt to turn", $(i) 264 print $2 ": currently", onoff ": attempt to turn", $(i)
265 break 265 break
266 } 266 }
267 } 267 }
268 } else if ($(i) == "requires" || $(i) == "if" || $(i) == "enables") { 268 } else if ($(i) == "requires" || $(i) == "if" || $(i) == "enables") {
269 key = $(i) 269 key = $(i)
270 } else if (key == "requires") { 270 } else if (key == "requires") {
271 requires[$2] = requires[$2] " " $(i) 271 requires[$2] = requires[$2] " " $(i)
272 } else if (key == "if") { 272 } else if (key == "if") {
273 iffs[$2] = iffs[$2] " " $(i) 273 iffs[$2] = iffs[$2] " " $(i)
274 } else if (key == "enables") { 274 } else if (key == "enables") {
275 enabledby[$(i)] = enabledby[$(i)] " " $2 275 enabledby[$(i)] = enabledby[$(i)] " " $2
276 } else 276 } else
277 break # bad line format 277 break # bad line format
278 } 278 }
279 279
280 if (i > NF) { 280 if (i > NF) {
281 # Set the option, defaulting to 'enabled' 281 # Set the option, defaulting to 'enabled'
282 if (onoff == "") onoff = "enabled" 282 if (onoff == "") onoff = "enabled"
283 option[$2] = onoff 283 option[$2] = onoff
284 next 284 next
285 } 285 }
286 # Else fall through to the error handler 286 # Else fall through to the error handler
287} 287}
288 288
289# chunk NAME [requires OPT] [on|off|disabled] 289# chunk NAME [requires OPT] [on|off|disabled]
290# Expands to the 'option' settings appropriate to the reading and 290# Expands to the 'option' settings appropriate to the reading and
291# writing of an ancilliary PNG chunk 'NAME': 291# writing of an ancilliary PNG chunk 'NAME':
292# 292#
293# option READ_NAME requires READ_ANCILLARY_CHUNKS [READ_OPT] 293# option READ_NAME requires READ_ANCILLARY_CHUNKS [READ_OPT]
294# option READ_NAME enables NAME 294# option READ_NAME enables NAME
295# [option READ_NAME off] 295# [option READ_NAME off]
296# option WRITE_NAME requires WRITE_ANCILLARY_CHUNKS [WRITE_OPT] 296# option WRITE_NAME requires WRITE_ANCILLARY_CHUNKS [WRITE_OPT]
297# option WRITE_NAME enables NAME 297# option WRITE_NAME enables NAME
298# [option WRITE_NAME off] 298# [option WRITE_NAME off]
299 299
300pre != 0 && $1 == "chunk" && NF >= 2{ 300pre != 0 && $1 == "chunk" && NF >= 2{
301 # 'chunk' is handled on the first pass by writing appropriate 301 # 'chunk' is handled on the first pass by writing appropriate
302 # 'option' lines into the intermediate file. 302 # 'option' lines into the intermediate file.
303 onoff = "" 303 onoff = ""
304 reqread = "" 304 reqread = ""
305 reqwrite = "" 305 reqwrite = ""
306 i = 3 # indicates format error 306 i = 3 # indicates format error
307 if (NF > 2) { 307 if (NF > 2) {
308 # read the keywords/additional OPTS 308 # read the keywords/additional OPTS
309 req = 0 309 req = 0
310 for (i=3; i<=NF; ++i) { 310 for (i=3; i<=NF; ++i) {
311 if ($(i) == "on" || $(i) == "off" || $(i) == "disabled") { 311 if ($(i) == "on" || $(i) == "off" || $(i) == "disabled") {
312 if (onoff != $(i)) { 312 if (onoff != $(i)) {
313 if (onoff == "") 313 if (onoff == "")
314 onoff = $(i) 314 onoff = $(i)
315 else 315 else
316 break # on/off conflict 316 break # on/off conflict
317 } 317 }
318 } else if ($(i) == "requires") 318 } else if ($(i) == "requires")
319 req = 1 319 req = 1
320 else if (req != 1) 320 else if (req != 1)
321 break # bad line: handled below 321 break # bad line: handled below
322 else { 322 else {
323 reqread = reqread " READ_" $(i) 323 reqread = reqread " READ_" $(i)
324 reqwrite = reqwrite " WRITE_" $(i) 324 reqwrite = reqwrite " WRITE_" $(i)
325 } 325 }
326 } 326 }
327 } 327 }
328 328
329 if (i > NF) { 329 if (i > NF) {
330 # Output new 'option' lines to the intermediate file (out) 330 # Output new 'option' lines to the intermediate file (out)
331 print "option READ_" $2, "requires READ_ANCILLARY_CHUNKS" reqread, "enables", $2, onoff >out 331 print "option READ_" $2, "requires READ_ANCILLARY_CHUNKS" reqread, "enables", $2, onoff >out
332 print "option WRITE_" $2, "requires WRITE_ANCILLARY_CHUNKS" reqwrite, "enables", $2, onoff >out 332 print "option WRITE_" $2, "requires WRITE_ANCILLARY_CHUNKS" reqwrite, "enables", $2, onoff >out
333 next 333 next
334 } 334 }
335 # Else hit the error handler below - bad line format! 335 # Else hit the error handler below - bad line format!
336} 336}
337 337
338# setting MACRO ( requires MACRO* )* [ default VALUE ] 338# setting MACRO ( requires MACRO* )* [ default VALUE ]
339# Behaves in a similar way to 'option' without looking for NO_ or 339# Behaves in a similar way to 'option' without looking for NO_ or
340# _SUPPORTED; the macro is enabled if it is defined so long as all 340# _SUPPORTED; the macro is enabled if it is defined so long as all
341# the 'requires' macros are also defined. The definitions may be 341# the 'requires' macros are also defined. The definitions may be
342# empty, an error will be issued if the 'requires' macros are 342# empty, an error will be issued if the 'requires' macros are
343# *not* defined. If given the 'default' value is used if the 343# *not* defined. If given the 'default' value is used if the
344# macro is not defined. The default value will be re-tokenised. 344# macro is not defined. The default value will be re-tokenised.
345# (BTW: this is somewhat restrictive, it mainly exists for the 345# (BTW: this is somewhat restrictive, it mainly exists for the
346# support of non-standard configurations and numeric parameters, 346# support of non-standard configurations and numeric parameters,
347# see the uses in scripts/options.dat 347# see the uses in scripts/options.dat
348 348
349$1 == "setting" && (NF == 2 || NF >= 3 && ($3 == "requires" || $3 == "default")){ 349$1 == "setting" && (NF == 2 || NF >= 3 && ($3 == "requires" || $3 == "default")){
350 reqs = "" 350 reqs = ""
351 deflt = "" 351 deflt = ""
352 isdef = 0 352 isdef = 0
353 key = "" 353 key = ""
354 for (i=3; i<=NF; ++i) 354 for (i=3; i<=NF; ++i)
355 if ($(i) == "requires" || $(i) == "default") { 355 if ($(i) == "requires" || $(i) == "default") {
356 key = $(i) 356 key = $(i)
357 if (key == "default") isdef = 1 357 if (key == "default") isdef = 1
358 } else if (key == "requires") 358 } else if (key == "requires")
359 reqs = reqs " " $(i) 359 reqs = reqs " " $(i)
360 else if (key == "default") 360 else if (key == "default")
361 deflt = deflt " " $(i) 361 deflt = deflt " " $(i)
362 else 362 else
363 break # Format error, handled below 363 break # Format error, handled below
364 364
365 setting[$2] = reqs 365 setting[$2] = reqs
366 # NOTE: this overwrites a previous value silently 366 # NOTE: this overwrites a previous value silently
367 if (isdef && deflt == "") 367 if (isdef && deflt == "")
368 deflt = " " # as a flag to force output 368 deflt = " " # as a flag to force output
369 defaults[$2] = deflt 369 defaults[$2] = deflt
370 next 370 next
371} 371}
372 372
373# The order of the dependency lines (option, chunk, setting) is irrelevant 373# The order of the dependency lines (option, chunk, setting) is irrelevant
374# - the 'enables', 'requires' and 'if' settings will be used to determine 374# - the 'enables', 'requires' and 'if' settings will be used to determine
375# the correct order in the output and the final values in pnglibconf.h are 375# the correct order in the output and the final values in pnglibconf.h are
376# not order dependent. 'requires' and 'if' entries take precedence over 376# not order dependent. 'requires' and 'if' entries take precedence over
377# 'enables' from other options; if an option requires another option it 377# 'enables' from other options; if an option requires another option it
378# won't be set regardless of any options that enable it unless the other 378# won't be set regardless of any options that enable it unless the other
379# option is also enabled. 379# option is also enabled.
380# 380#
381# Similarly 'enables' trumps a NO_ definition in CFLAGS or pngusr.h 381# Similarly 'enables' trumps a NO_ definition in CFLAGS or pngusr.h
382# 382#
383# For simplicity cycles in the definitions are regarded as errors, 383# For simplicity cycles in the definitions are regarded as errors,
384# even if they are not ambiguous. 384# even if they are not ambiguous.
385# A given NAME can be specified in as many 'option' lines as required, the 385# A given NAME can be specified in as many 'option' lines as required, the
386# definitions are additive. 386# definitions are additive.
387 387
388# For backwards compatibility equivalent macros may be listed thus: 388# For backwards compatibility equivalent macros may be listed thus:
389# 389#
390# = [NO_]NAME MACRO 390# = [NO_]NAME MACRO
391# Makes -DMACRO equivalent to -DPNG_NO_NAME or -DPNG_NAME_SUPPORTED 391# Makes -DMACRO equivalent to -DPNG_NO_NAME or -DPNG_NAME_SUPPORTED
392# as appropriate. 392# as appropriate.
393# 393#
394# The definition is injected into the C compiler input when encountered 394# The definition is injected into the C compiler input when encountered
395# in the second pass (so all these definitions appear *after* the @ 395# in the second pass (so all these definitions appear *after* the @
396# lines!) 396# lines!)
397# 397#
398# 'NAME' is as above, but 'MACRO' is the full text of the equivalent 398# 'NAME' is as above, but 'MACRO' is the full text of the equivalent
399# old, deprecated, macro. 399# old, deprecated, macro.
400 400
401$1 == "=" && NF == 3{ 401$1 == "=" && NF == 3{
402 print "#ifdef PNG_" $3 >out 402 print "#ifdef PNG_" $3 >out
403 if ($2 ~ /^NO_/) 403 if ($2 ~ /^NO_/)
404 print "# define PNG_" $2 >out 404 print "# define PNG_" $2 >out
405 else 405 else
406 print "# define PNG_" $2 "_SUPPORTED" >out 406 print "# define PNG_" $2 "_SUPPORTED" >out
407 print "#endif" >out 407 print "#endif" >out
408 next 408 next
409} 409}
410 410
411# Lines may be injected into the C compiler input by preceding them 411# Lines may be injected into the C compiler input by preceding them
412# with an "@" character. The line is copied with just the leading 412# with an "@" character. The line is copied with just the leading
413# @ removed. 413# @ removed.
414 414
415$1 ~ /^@/{ 415$1 ~ /^@/{
416 # sub(/^[ ]*@/, "") 416 # sub(/^[ ]*@/, "")
417 $1 = substr($1, 2) 417 $1 = substr($1, 2)
418 print >out 418 print >out
419 next 419 next
420} 420}
421 421
422# Check for unreognized lines, because of the preprocessing chunk 422# Check for unreognized lines, because of the preprocessing chunk
423# format errors will be detected on the first pass independent of 423# format errors will be detected on the first pass independent of
424# any other format errors. 424# any other format errors.
425{ 425{
426 print "options.awk: bad line (" NR "):", $0 426 print "options.awk: bad line (" NR "):", $0
427 err = 1 # prevent END{} running 427 err = 1 # prevent END{} running
428 exit 1 428 exit 1
429} 429}
430 430
431# For checking purposes names that start with "ok_" or "fail_" are 431# For checking purposes names that start with "ok_" or "fail_" are
432# not output to pnglibconf.h and must be either enabled or disabled 432# not output to pnglibconf.h and must be either enabled or disabled
433# respectively for the build to succeed. This allows interdependencies 433# respectively for the build to succeed. This allows interdependencies
434# between options of the form "at least one of" or "at most one of" 434# between options of the form "at least one of" or "at most one of"
435# to be checked. For example: 435# to be checked. For example:
436# 436#
437# option FLOATING_POINT enables ok_math 437# option FLOATING_POINT enables ok_math
438# option FIXED_POINT enables ok_math 438# option FIXED_POINT enables ok_math
439# This ensures that at least one of FLOATING_POINT and FIXED_POINT 439# This ensures that at least one of FLOATING_POINT and FIXED_POINT
440# must be set for the build to succeed. 440# must be set for the build to succeed.
441# 441#
442# option fail_math requires FLOATING_POINT FIXED_POINT 442# option fail_math requires FLOATING_POINT FIXED_POINT
443# This means the build will fail if *both* FLOATING_POINT and 443# This means the build will fail if *both* FLOATING_POINT and
444# FIXED_POINT are set (this is an example; in fact both are allowed.) 444# FIXED_POINT are set (this is an example; in fact both are allowed.)
445# 445#
446# If all these options were given the build would require exactly one 446# If all these options were given the build would require exactly one
447# of the names to be enabled. 447# of the names to be enabled.
448 448
449END{ 449END{
450 # END{} gets run on an exit (a traditional awk feature) 450 # END{} gets run on an exit (a traditional awk feature)
451 if (err) exit 1 451 if (err) exit 1
452 452
453 if (pre) { 453 if (pre) {
454 # Record the final value of the variables 454 # Record the final value of the variables
455 print "deb =", deb >out 455 print "deb =", deb >out
456 if (everything != "") { 456 if (everything != "") {
457 print "everything =", everything >out 457 print "everything =", everything >out
458 } 458 }
459 print "logunsupported =", logunsupported >out 459 print "logunsupported =", logunsupported >out
460 exit 0 460 exit 0
461 } 461 }
462 462
463 # Do the 'setting' values first, the algorithm the standard 463 # Do the 'setting' values first, the algorithm the standard
464 # tree walk (O(1)) done in an O(2) while/for loop; interations 464 # tree walk (O(1)) done in an O(2) while/for loop; interations
465 # settings x depth, outputing the deepest required macros 465 # settings x depth, outputing the deepest required macros
466 # first. 466 # first.
467 print "" >out 467 print "" >out
468 print "/* SETTINGS */" >out 468 print "/* SETTINGS */" >out
469 print comment, "settings", cend >out 469 print comment, "settings", cend >out
470 finished = 0 470 finished = 0
471 while (!finished) { 471 while (!finished) {
472 finished = 1 472 finished = 1
473 movement = 0 # done nothing 473 movement = 0 # done nothing
474 for (i in setting) if (!doneset[i]) { 474 for (i in setting) if (!doneset[i]) {
475 nreqs = split(setting[i], r) 475 nreqs = split(setting[i], r)
476 if (nreqs > 0) { 476 if (nreqs > 0) {
477 for (j=1; j<=nreqs; ++j) if (!doneset[r[j]]) { 477 for (j=1; j<=nreqs; ++j) if (!doneset[r[j]]) {
478 break 478 break
479 } 479 }
480 if (j<=nreqs) { 480 if (j<=nreqs) {
481 finished = 0 481 finished = 0
482 continue # try a different setting 482 continue # try a different setting
483 } 483 }
484 } 484 }
485 485
486 # All the requirements have been processed, output 486 # All the requirements have been processed, output
487 # this setting. 487 # this setting.
488 if (deb) print "setting", i 488 if (deb) print "setting", i
489 print "" >out 489 print "" >out
490 print "/* setting: ", i >out 490 print "/* setting: ", i >out
491 print " * requires:" setting[i] >out 491 print " * requires:" setting[i] >out
492 print " * default: ", defaults[i], "*/" >out 492 print " * default: ", defaults[i], "*/" >out
493 if (defaults[i] == "") { # no default, only check if defined 493 if (defaults[i] == "") { # no default, only check if defined
494 print "#ifdef PNG_" i >out 494 print "#ifdef PNG_" i >out
495 } 495 }
496 for (j=1; j<=nreqs; ++j) { 496 for (j=1; j<=nreqs; ++j) {
497 print "# ifndef PNG_" r[j] >out 497 print "# ifndef PNG_" r[j] >out
498 print error, i, "requires", r[j] end >out 498 print error, i, "requires", r[j] end >out
499 print "# endif" >out 499 print "# endif" >out
500 } 500 }
501 if (defaults[i] != "") { # default handling 501 if (defaults[i] != "") { # default handling
502 print "#ifdef PNG_" i >out 502 print "#ifdef PNG_" i >out
503 } 503 }
504 print def i, "PNG_" i end >out 504 print def i, "PNG_" i end >out
505 if (defaults[i] != "") { 505 if (defaults[i] != "") {
506 print "#else /*default*/" >out 506 print "#else /*default*/" >out
507 # And add the default definition for the benefit 507 # And add the default definition for the benefit
508 # of later settings an options test: 508 # of later settings an options test:
509 print "# define PNG_" i defaults[i] >out 509 print "# define PNG_" i defaults[i] >out
510 print def i defaults[i] end >out 510 print def i defaults[i] end >out
511 } 511 }
512 print "#endif" >out 512 print "#endif" >out
513 513
514 doneset[i] = 1 514 doneset[i] = 1
515 ++movement 515 ++movement
516 } 516 }
517 517
518 if (!finished && !movement) { 518 if (!finished && !movement) {
519 print "setting: loop or missing setting in 'requires', cannot process:" 519 print "setting: loop or missing setting in 'requires', cannot process:"
520 for (i in setting) if (!doneset[i]) { 520 for (i in setting) if (!doneset[i]) {
521 print " setting", i, "requires" setting[i] 521 print " setting", i, "requires" setting[i]
522 } 522 }
523 exit 1 523 exit 1
524 } 524 }
525 } 525 }
526 print comment, "end of settings", cend >out 526 print comment, "end of settings", cend >out
527 527
528 # Now do the options - somewhat more complex. The dependency 528 # Now do the options - somewhat more complex. The dependency
529 # tree is thus: 529 # tree is thus:
530 # 530 #
531 # name > name 531 # name > name
532 # name requires name 532 # name requires name
533 # name if name 533 # name if name
534 # name enabledby name 534 # name enabledby name
535 # 535 #
536 # First build a list 'tree' by option of all the things on which 536 # First build a list 'tree' by option of all the things on which
537 # it depends. 537 # it depends.
538 print "" >out 538 print "" >out
539 print "/* OPTIONS */" >out 539 print "/* OPTIONS */" >out
540 print comment, "options", cend >out 540 print comment, "options", cend >out
541 for (opt in enabledby) tree[opt] = 1 # may not be explicit options 541 for (opt in enabledby) tree[opt] = 1 # may not be explicit options
542 for (opt in option) if (opt != "") { 542 for (opt in option) if (opt != "") {
543 o = option[opt] 543 o = option[opt]
544 # option should always be one of the following values 544 # option should always be one of the following values
545 if (o != "on" && o != "off" && o != "disabled" && o != "enabled") { 545 if (o != "on" && o != "off" && o != "disabled" && o != "enabled") {
546 print "internal option error (" o ")" 546 print "internal option error (" o ")"
547 exit 1 547 exit 1
548 } 548 }
549 tree[opt] = "" # so unlisted options marked 549 tree[opt] = "" # so unlisted options marked
550 } 550 }
551 for (opt in tree) if (opt != "") { 551 for (opt in tree) if (opt != "") {
552 if (tree[opt] == 1) { 552 if (tree[opt] == 1) {
553 tree[opt] = "" 553 tree[opt] = ""
554 if (option[opt] != "") { 554 if (option[opt] != "") {
555 print "internal error (1)" 555 print "internal error (1)"
556 exit 1 556 exit 1
557 } 557 }
558 # Macros only listed in 'enables' remain off unless 558 # Macros only listed in 'enables' remain off unless
559 # one of the enabling macros is on. 559 # one of the enabling macros is on.
560 option[opt] = "disabled" 560 option[opt] = "disabled"
561 } 561 }
562 562
563 split("", list) # clear 'list' 563 split("", list) # clear 'list'
564 # Now add every requires, iffs or enabledby entry to 'list' 564 # Now add every requires, iffs or enabledby entry to 'list'
565 # so that we can add a unique list of requirements to tree[i] 565 # so that we can add a unique list of requirements to tree[i]
566 split(requires[opt] iffs[opt] enabledby[opt], r) 566 split(requires[opt] iffs[opt] enabledby[opt], r)
567 for (i in r) list[r[i]] = 1 567 for (i in r) list[r[i]] = 1
568 for (i in list) tree[opt] = tree[opt] " " i 568 for (i in list) tree[opt] = tree[opt] " " i
569 } 569 }
570 570
571 # print the tree for extreme debugging 571 # print the tree for extreme debugging
572 if (deb > 2) for (i in tree) if (i != "") print i, "depends-on" tree[i] 572 if (deb > 2) for (i in tree) if (i != "") print i, "depends-on" tree[i]
573 573
574 # Ok, now check all options marked explicitly 'on' or 'off': 574 # Ok, now check all options marked explicitly 'on' or 'off':
575 # 575 #
576 # If an option[opt] is 'on' then turn on all requires[opt] 576 # If an option[opt] is 'on' then turn on all requires[opt]
577 # If an option[opt] is 'off' then turn off all enabledby[opt] 577 # If an option[opt] is 'off' then turn off all enabledby[opt]
578 # 578 #
579 # Error out if we have to turn 'on' an 'off' option or vice versa. 579 # Error out if we have to turn 'on' an 'off' option or vice versa.
580 npending = 0 580 npending = 0
581 for (opt in option) if (opt != "") { 581 for (opt in option) if (opt != "") {
582 if (option[opt] == "on" || option[opt] == "off") { 582 if (option[opt] == "on" || option[opt] == "off") {
583 pending[++npending] = opt 583 pending[++npending] = opt
584 } 584 }
585 } 585 }
586 586
587 err = 0 # set on error 587 err = 0 # set on error
588 while (npending > 0) { 588 while (npending > 0) {
589 opt = pending[npending--] 589 opt = pending[npending--]
590 if (option[opt] == "on") { 590 if (option[opt] == "on") {
591 nreqs = split(requires[opt], r) 591 nreqs = split(requires[opt], r)
592 for (j=1; j<=nreqs; ++j) { 592 for (j=1; j<=nreqs; ++j) {
593 if (option[r[j]] == "off") { 593 if (option[r[j]] == "off") {
594 print "option", opt, "turned on, but requirement", r[j], "is turned off" 594 print "option", opt, "turned on, but requirement", r[j], "is turned off"
595 err = 1 595 err = 1
596 } else if (option[r[j]] != "on") { 596 } else if (option[r[j]] != "on") {
597 option[r[j]] = "on" 597 option[r[j]] = "on"
598 pending[++npending] = r[j] 598 pending[++npending] = r[j]
599 } 599 }
600 } 600 }
601 } else { 601 } else {
602 if (option[opt] != "off") { 602 if (option[opt] != "off") {
603 print "internal error (2)" 603 print "internal error (2)"
604 exit 1 604 exit 1
605 } 605 }
606 nreqs = split(enabledby[opt], r) 606 nreqs = split(enabledby[opt], r)
607 for (j=1; j<=nreqs; ++j) { 607 for (j=1; j<=nreqs; ++j) {
608 if (option[r[j]] == "on") { 608 if (option[r[j]] == "on") {
609 print "option", opt, "turned off, but enabled by", r[j], "which is turned on" 609 print "option", opt, "turned off, but enabled by", r[j], "which is turned on"
610 err = 1 610 err = 1
611 } else if (option[r[j]] != "off") { 611 } else if (option[r[j]] != "off") {
612 option[r[j]] = "off" 612 option[r[j]] = "off"
613 pending[++npending] = r[j] 613 pending[++npending] = r[j]
614 } 614 }
615 } 615 }
616 } 616 }
617 } 617 }
618 if (err) exit 1 618 if (err) exit 1
619 619
620 # option[i] is now the complete list of all the tokens we may 620 # option[i] is now the complete list of all the tokens we may
621 # need to output, go through it as above, depth first. 621 # need to output, go through it as above, depth first.
622 finished = 0 622 finished = 0
623 while (!finished) { 623 while (!finished) {
624 finished = 1 624 finished = 1
625 movement = 0 # done nothing 625 movement = 0 # done nothing
626 for (i in option) if (!done[i]) { 626 for (i in option) if (!done[i]) {
627 nreqs = split(tree[i], r) 627 nreqs = split(tree[i], r)
628 if (nreqs > 0) { 628 if (nreqs > 0) {
629 for (j=1; j<=nreqs; ++j) if (!done[r[j]]) { 629 for (j=1; j<=nreqs; ++j) if (!done[r[j]]) {
630 break 630 break
631 } 631 }
632 if (j<=nreqs) { 632 if (j<=nreqs) {
633 finished = 0 633 finished = 0
634 continue # next option 634 continue # next option
635 } 635 }
636 } 636 }
637 637
638 # All the requirements have been processed, output 638 # All the requirements have been processed, output
639 # this option. An option is _SUPPORTED if: 639 # this option. An option is _SUPPORTED if:
640 # 640 #
641 # all 'requires' are _SUPPORTED AND 641 # all 'requires' are _SUPPORTED AND
642 # at least one of the 'if' options are _SUPPORTED AND 642 # at least one of the 'if' options are _SUPPORTED AND
643 # EITHER: 643 # EITHER:
644 # The name is _SUPPORTED (on the command line) 644 # The name is _SUPPORTED (on the command line)
645 # OR: 645 # OR:
646 # an 'enabledby' is _SUPPORTED 646 # an 'enabledby' is _SUPPORTED
647 # OR: 647 # OR:
648 # NO_name is not defined AND 648 # NO_name is not defined AND
649 # the option is not disabled; an option is disabled if: 649 # the option is not disabled; an option is disabled if:
650 # option == off 650 # option == off
651 # option == disabled && everything != on 651 # option == disabled && everything != on
652 # option == "" && everything == off 652 # option == "" && everything == off
653 if (deb) print "option", i 653 if (deb) print "option", i
654 print "" >out 654 print "" >out
655 print "/* option:", i, option[i] >out 655 print "/* option:", i, option[i] >out
656 print " * requires: " requires[i] >out 656 print " * requires: " requires[i] >out
657 print " * if: " iffs[i] >out 657 print " * if: " iffs[i] >out
658 print " * enabled-by:" enabledby[i], "*/" >out 658 print " * enabled-by:" enabledby[i], "*/" >out
659 print "#undef PNG_on" >out 659 print "#undef PNG_on" >out
660 print "#define PNG_on 1" >out 660 print "#define PNG_on 1" >out
661 661
662 # requires 662 # requires
663 nreqs = split(requires[i], r) 663 nreqs = split(requires[i], r)
664 for (j=1; j<=nreqs; ++j) { 664 for (j=1; j<=nreqs; ++j) {
665 print "#ifndef PNG_" r[j] "_SUPPORTED" >out 665 print "#ifndef PNG_" r[j] "_SUPPORTED" >out
666 print "# undef PNG_on /*!" r[j] "*/" >out 666 print "# undef PNG_on /*!" r[j] "*/" >out
667 # this error appears in the final output if something 667 # this error appears in the final output if something
668 # was switched 'on' but the processing above to force 668 # was switched 'on' but the processing above to force
669 # the requires did not work 669 # the requires did not work
670 if (option[i] == "on") { 670 if (option[i] == "on") {
671 print error, i, "requires", r[j] end >out 671 print error, i, "requires", r[j] end >out
672 } 672 }
673 print "#endif" >out 673 print "#endif" >out
674 } 674 }
675 675
676 # if 676 # if
677 nreqs = split(iffs[i], r) 677 nreqs = split(iffs[i], r)
678 print "#undef PNG_no_if" >out 678 print "#undef PNG_no_if" >out
679 if (nreqs > 0) { 679 if (nreqs > 0) {
680 print "/* if" iffs[i], "*/" >out 680 print "/* if" iffs[i], "*/" >out
681 print "#define PNG_no_if 1" >out 681 print "#define PNG_no_if 1" >out
682 for (j=1; j<=nreqs; ++j) { 682 for (j=1; j<=nreqs; ++j) {
683 print "#ifdef PNG_" r[j] "_SUPPORTED" >out 683 print "#ifdef PNG_" r[j] "_SUPPORTED" >out
684 print "# undef PNG_no_if /*" r[j] "*/" >out 684 print "# undef PNG_no_if /*" r[j] "*/" >out
685 print "#endif" >out 685 print "#endif" >out
686 } 686 }
687 print "#ifdef PNG_no_if /*missing if*/" >out 687 print "#ifdef PNG_no_if /*missing if*/" >out
688 print "# undef PNG_on" >out 688 print "# undef PNG_on" >out
689 # There is no checking above for this, because we 689 # There is no checking above for this, because we
690 # don't know which 'if' to choose, so whine about 690 # don't know which 'if' to choose, so whine about
691 # it here: 691 # it here:
692 if (option[i] == "on") { 692 if (option[i] == "on") {
693 print error, i, "needs one of:", iffs[i] end >out 693 print error, i, "needs one of:", iffs[i] end >out
694 } 694 }
695 print "#endif" >out 695 print "#endif" >out
696 } 696 }
697 697
698 print "#ifdef PNG_on /*requires, if*/" >out 698 print "#ifdef PNG_on /*requires, if*/" >out
699 # enables 699 # enables
700 print "# undef PNG_not_enabled" >out 700 print "# undef PNG_not_enabled" >out
701 print "# define PNG_not_enabled 1" >out 701 print "# define PNG_not_enabled 1" >out
702 print " /* enabled by" enabledby[i], "*/" >out 702 print " /* enabled by" enabledby[i], "*/" >out
703 nreqs = split(enabledby[i], r) 703 nreqs = split(enabledby[i], r)
704 for (j=1; j<=nreqs; ++j) { 704 for (j=1; j<=nreqs; ++j) {
705 print "#ifdef PNG_" r[j] "_SUPPORTED" >out 705 print "#ifdef PNG_" r[j] "_SUPPORTED" >out
706 print "# undef PNG_not_enabled /*" r[j] "*/" >out 706 print "# undef PNG_not_enabled /*" r[j] "*/" >out
707 # Oops, probably not intended (should be factored 707 # Oops, probably not intended (should be factored
708 # out by the checks above). 708 # out by the checks above).
709 if (option[i] == "off") { 709 if (option[i] == "off") {
710 print error, i, "enabled by:", r[j] end >out 710 print error, i, "enabled by:", r[j] end >out
711 } 711 }
712 print "#endif" >out 712 print "#endif" >out
713 } 713 }
714 714
715 print "# ifndef PNG_" i "_SUPPORTED /*!command line*/" >out 715 print "# ifndef PNG_" i "_SUPPORTED /*!command line*/" >out
716 print "# ifdef PNG_not_enabled /*!enabled*/" >out 716 print "# ifdef PNG_not_enabled /*!enabled*/" >out
717 if (option[i] == "off" || option[i] == "disabled" && everything != "on" || option[i] == "enabled" && everything == "off") { 717 if (option[i] == "off" || option[i] == "disabled" && everything != "on" || option[i] == "enabled" && everything == "off") {
718 print "# undef PNG_on /*default off*/" >out 718 print "# undef PNG_on /*default off*/" >out
719 } else { 719 } else {
720 print "# ifdef PNG_NO_" i >out 720 print "# ifdef PNG_NO_" i >out
721 print "# undef PNG_on /*turned off*/" >out 721 print "# undef PNG_on /*turned off*/" >out
722 print "# endif" >out 722 print "# endif" >out
723 print "# ifdef PNG_NO_" i "_SUPPORTED" >out 723 print "# ifdef PNG_NO_" i "_SUPPORTED" >out
724 print "# undef PNG_on /*turned off*/" >out 724 print "# undef PNG_on /*turned off*/" >out
725 print "# endif" >out 725 print "# endif" >out
726 } 726 }
727 print "# endif /*!enabled*/" >out 727 print "# endif /*!enabled*/" >out
728 print "# ifdef PNG_on" >out 728 print "# ifdef PNG_on" >out
729 # The _SUPPORTED macro must be defined so that dependent 729 # The _SUPPORTED macro must be defined so that dependent
730 # options output later work. 730 # options output later work.
731 print "# define PNG_" i "_SUPPORTED" >out 731 print "# define PNG_" i "_SUPPORTED" >out
732 print "# endif" >out 732 print "# endif" >out
733 print "# endif /*!command line*/" >out 733 print "# endif /*!command line*/" >out
734 # If PNG_on is still set the option should be defined in 734 # If PNG_on is still set the option should be defined in
735 # pnglibconf.h 735 # pnglibconf.h
736 print "# ifdef PNG_on" >out 736 print "# ifdef PNG_on" >out
737 if (i ~ /^fail_/) { 737 if (i ~ /^fail_/) {
738 print error, i, "is on: enabled by:" iffs[i] enabledby[i] ", requires" requires[i] end >out 738 print error, i, "is on: enabled by:" iffs[i] enabledby[i] ", requires" requires[i] end >out
739 } else if (i !~ /^ok_/) { 739 } else if (i !~ /^ok_/) {
740 print def i sup >out 740 print def i sup >out
741 } 741 }
742 print "# endif /* definition */" >out 742 print "# endif /* definition */" >out
743 print "#endif /*requires, if*/" >out 743 print "#endif /*requires, if*/" >out
744 if (logunsupported || i ~ /^ok_/) { 744 if (logunsupported || i ~ /^ok_/) {
745 print "#ifndef PNG_on" >out 745 print "#ifndef PNG_on" >out
746 if (logunsupported) { 746 if (logunsupported) {
747 print und i une >out 747 print und i une >out
748 } 748 }
749 if (i ~ /^ok_/) { 749 if (i ~ /^ok_/) {
750 print error, i, "not enabled: requires:" requires[i] ", enabled by:" iffs[i] enabledby[i] end >out 750 print error, i, "not enabled: requires:" requires[i] ", enabled by:" iffs[i] enabledby[i] end >out
751 } 751 }
752 print "#endif" >out 752 print "#endif" >out
753 } 753 }
754 754
755 done[i] = 1 755 done[i] = 1
756 ++movement 756 ++movement
757 } 757 }
758 758
759 if (!finished && !movement) { 759 if (!finished && !movement) {
760 print "option: loop or missing option in dependency tree, cannot process:" 760 print "option: loop or missing option in dependency tree, cannot process:"
761 for (i in option) if (!done[i]) { 761 for (i in option) if (!done[i]) {
762 print " option", i, "depends on" tree[i], "needs:" 762 print " option", i, "depends on" tree[i], "needs:"
763 nreqs = split(tree[i], r) 763 nreqs = split(tree[i], r)
764 if (nreqs > 0) for (j=1; j<=nreqs; ++j) if (!done[r[j]]) { 764 if (nreqs > 0) for (j=1; j<=nreqs; ++j) if (!done[r[j]]) {
765 print " " r[j] 765 print " " r[j]
766 } 766 }
767 } 767 }
768 exit 1 768 exit 1
769 } 769 }
770 } 770 }
771 print comment, "end of options", cend >out 771 print comment, "end of options", cend >out
772 772
773 # Regular end - everything looks ok 773 # Regular end - everything looks ok
774 if (protect != "") { 774 if (protect != "") {
775 print start "#endif", cx, protect, "*/" end >out 775 print start "#endif", cx, protect, "*/" end >out
776 } 776 }
777} 777}
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.dfa b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.dfa
index b0ccd39..a740d68 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.dfa
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.dfa
@@ -1,578 +1,578 @@
1# scripts/pnglibconf.dfa - library build configuration control 1# scripts/pnglibconf.dfa - library build configuration control
2# 2#
3@/*- pnglibconf.dfn intermediate file 3@/*- pnglibconf.dfn intermediate file
4@ * generated from scripts/pnglibconf.dfa 4@ * generated from scripts/pnglibconf.dfa
5@ */ 5@ */
6# 6#
7com pnglibconf.h - library build configuration 7com pnglibconf.h - library build configuration
8com 8com
9version 9version
10com 10com
11com Copyright (c) 1998-2011 Glenn Randers-Pehrson 11com Copyright (c) 1998-2011 Glenn Randers-Pehrson
12com 12com
13com This code is released under the libpng license. 13com This code is released under the libpng license.
14com For conditions of distribution and use, see the disclaimer 14com For conditions of distribution and use, see the disclaimer
15com and license in png.h 15com and license in png.h
16com 16com
17 17
18file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H 18file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
19 19
20# This file is preprocessed by scripts/options.awk and the 20# This file is preprocessed by scripts/options.awk and the
21# C compiler to generate 'pnglibconf.h' - a list of all the 21# C compiler to generate 'pnglibconf.h' - a list of all the
22# configuration options. The file lists the various options 22# configuration options. The file lists the various options
23# that can *only* be specified during the libpng build; 23# that can *only* be specified during the libpng build;
24# pnglibconf.h freezes the definitons selected for the specific 24# pnglibconf.h freezes the definitons selected for the specific
25# build. 25# build.
26# 26#
27# The syntax is detailed in scripts/options.awk, this is a summary 27# The syntax is detailed in scripts/options.awk, this is a summary
28# only: 28# only:
29# 29#
30# setting <name> [requires ...] [default] 30# setting <name> [requires ...] [default]
31# #define PNG_<name> <value> /* value comes from current setting */ 31# #define PNG_<name> <value> /* value comes from current setting */
32# option <name> [requires ...] [if ...] [enables ...] [disabled] 32# option <name> [requires ...] [if ...] [enables ...] [disabled]
33# #define PNG_<name>_SUPPORTED if the requirements are met and 33# #define PNG_<name>_SUPPORTED if the requirements are met and
34# enable the other options listed 34# enable the other options listed
35# chunk <name> [requires ...] [disabled] 35# chunk <name> [requires ...] [disabled]
36# Enable chunk processing for the given ancillary chunk 36# Enable chunk processing for the given ancillary chunk
37# 37#
38# Note that the 'on' and 'off' keywords, while valid on both option 38# Note that the 'on' and 'off' keywords, while valid on both option
39# and chunk, should not be used in this file because they force the 39# and chunk, should not be used in this file because they force the
40# relevant options on or off. 40# relevant options on or off.
41 41
42#---------------------------------------------------------------------- 42#----------------------------------------------------------------------
43 43
44# The following setting, option and chunk values can all be changed 44# The following setting, option and chunk values can all be changed
45# while building libpng: 45# while building libpng:
46# 46#
47# setting: change 'setting' lines to fine tune library performance, 47# setting: change 'setting' lines to fine tune library performance,
48# changes to the settings don't affect the libpng API functionally 48# changes to the settings don't affect the libpng API functionally
49# 49#
50# option: change 'option' lines to remove or add capabilities from 50# option: change 'option' lines to remove or add capabilities from
51# or to the library; options change the library API 51# or to the library; options change the library API
52# 52#
53# chunk: change 'chunk' lines to remove capabilities to process 53# chunk: change 'chunk' lines to remove capabilities to process
54# optional ('ancillary') chunks. This does not prevent PNG 54# optional ('ancillary') chunks. This does not prevent PNG
55# decoding but does change the libpng API because some chunks 55# decoding but does change the libpng API because some chunks
56# will be ignored. 56# will be ignored.
57# 57#
58# There are three ways of disabling features, in no particular order: 58# There are three ways of disabling features, in no particular order:
59# 59#
60# 1) Create 'pngusr.h', enter the required private build information 60# 1) Create 'pngusr.h', enter the required private build information
61# detailed below and #define PNG_NO_<option> for each option you 61# detailed below and #define PNG_NO_<option> for each option you
62# don't want in that file in that file. You can also turn on options 62# don't want in that file in that file. You can also turn on options
63# using PNG_<option>_SUPPORTED. When you have finished rerun 63# using PNG_<option>_SUPPORTED. When you have finished rerun
64# configure and rebuild pnglibconf.h file with -DPNG_USER_CONFIG: 64# configure and rebuild pnglibconf.h file with -DPNG_USER_CONFIG:
65# 65#
66# make clean 66# make clean
67# CPPFLAGS='-DPNG_USER_CONFIG' ./configure 67# CPPFLAGS='-DPNG_USER_CONFIG' ./configure
68# make pnglibconf.h 68# make pnglibconf.h
69# 69#
70# pngusr.h is only used during the creation of pnglibconf.h, but it 70# pngusr.h is only used during the creation of pnglibconf.h, but it
71# is safer to ensure that -DPNG_USER_CONFIG is specified throughout 71# is safer to ensure that -DPNG_USER_CONFIG is specified throughout
72# the build by changing the CPPFLAGS passed to the initial ./configure 72# the build by changing the CPPFLAGS passed to the initial ./configure
73# 73#
74# 2) Add definitions of the settings you want to change to 74# 2) Add definitions of the settings you want to change to
75# CPPFLAGS; for example: 75# CPPFLAGS; for example:
76# 76#
77# -DPNG_DEFAULT_READ_MACROS=0 77# -DPNG_DEFAULT_READ_MACROS=0
78# 78#
79# (This would change the default to *not* use read macros.) Be 79# (This would change the default to *not* use read macros.) Be
80# very careful to change only settings that don't alter the API 80# very careful to change only settings that don't alter the API
81# because this approach bypasses the private build checking. You 81# because this approach bypasses the private build checking. You
82# can also change settings from pngpriv.h (read pngpriv.h) safely 82# can also change settings from pngpriv.h (read pngpriv.h) safely
83# without API changes. Do that in the same way. 83# without API changes. Do that in the same way.
84# 84#
85# 3) Write a new '.dfa' file (say 'pngusr.dfa') and in this file 85# 3) Write a new '.dfa' file (say 'pngusr.dfa') and in this file
86# provide override values for setting entries and turn option or 86# provide override values for setting entries and turn option or
87# chunk values explicitly 'on' or 'off': 87# chunk values explicitly 'on' or 'off':
88# 88#
89# setting FOO default VALUE 89# setting FOO default VALUE
90# option BAR [on|off] 90# option BAR [on|off]
91# 91#
92# Then add this file to the options.awk command line (the *first* 92# Then add this file to the options.awk command line (the *first*
93# one) after this file. The make macro DFA_XTRA is provided to make 93# one) after this file. The make macro DFA_XTRA is provided to make
94# this easier (set it like CPPFLAGS prior to running ./configure). 94# this easier (set it like CPPFLAGS prior to running ./configure).
95# Look at the builds below contrib/pngminim for some extreme examples 95# Look at the builds below contrib/pngminim for some extreme examples
96# of how this can be used. 96# of how this can be used.
97# 97#
98# Don't edit this file unless you are contributing a patch to 98# Don't edit this file unless you are contributing a patch to
99# libpng and need new or modified options/settings. 99# libpng and need new or modified options/settings.
100#---------------------------------------------------------------------- 100#----------------------------------------------------------------------
101 101
102# The following causes commented out #undef lines to be written to 102# The following causes commented out #undef lines to be written to
103# pnglibconf.h; this can be stopped by logunsupported=0 in a later 103# pnglibconf.h; this can be stopped by logunsupported=0 in a later
104# file or on the command line (after pnglibconf.dfa) 104# file or on the command line (after pnglibconf.dfa)
105 105
106logunsupported = 1 106logunsupported = 1
107 107
108# PNG_USER_CONFIG has to be defined on the compiler command line 108# PNG_USER_CONFIG has to be defined on the compiler command line
109# to cause pngusr.h to be read while constructing pnglibconf.h 109# to cause pngusr.h to be read while constructing pnglibconf.h
110# 110#
111# If you create a private DLL you need to define the following 111# If you create a private DLL you need to define the following
112# macros in the file 'pngusr.h' and set -DPNG_USER_CONFIG for 112# macros in the file 'pngusr.h' and set -DPNG_USER_CONFIG for
113# compilation (i.e. in CFLAGS.) 113# compilation (i.e. in CFLAGS.)
114# #define PNG_USER_PRIVATEBUILD \ 114# #define PNG_USER_PRIVATEBUILD \
115# <Describes by whom and why this version of the DLL was built> 115# <Describes by whom and why this version of the DLL was built>
116# e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons." 116# e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
117# #define PNG_USER_DLLFNAME_POSTFIX <two-letter postfix that serve to 117# #define PNG_USER_DLLFNAME_POSTFIX <two-letter postfix that serve to
118# distinguish your DLL from those of the official release. These 118# distinguish your DLL from those of the official release. These
119# correspond to the trailing letters that come after the version 119# correspond to the trailing letters that come after the version
120# number and must match your private DLL name> 120# number and must match your private DLL name>
121# e.g. // private DLL "libpng13gx.dll" 121# e.g. // private DLL "libpng13gx.dll"
122# #define PNG_USER_DLLFNAME_POSTFIX "gx" 122# #define PNG_USER_DLLFNAME_POSTFIX "gx"
123# 123#
124# The following macros are also at your disposal if you want to complete the 124# The following macros are also at your disposal if you want to complete the
125# DLL VERSIONINFO structure. 125# DLL VERSIONINFO structure.
126# - PNG_USER_VERSIONINFO_COMMENTS 126# - PNG_USER_VERSIONINFO_COMMENTS
127# - PNG_USER_VERSIONINFO_COMPANYNAME 127# - PNG_USER_VERSIONINFO_COMPANYNAME
128# - PNG_USER_VERSIONINFO_LEGALTRADEMARKS 128# - PNG_USER_VERSIONINFO_LEGALTRADEMARKS
129 129
130@#ifdef PNG_USER_CONFIG 130@#ifdef PNG_USER_CONFIG
131@# include "pngusr.h" 131@# include "pngusr.h"
132@#endif 132@#endif
133 133
134# This is a special fixup for the Watcom C compiler on Windows, which has 134# This is a special fixup for the Watcom C compiler on Windows, which has
135# multiple procedure call standards. Unless PNG_API_RULE is set explicitly 135# multiple procedure call standards. Unless PNG_API_RULE is set explicitly
136# (i.e. if it is not defined at this point) it will be forced to '2' here when 136# (i.e. if it is not defined at this point) it will be forced to '2' here when
137# using Watcom. This indicates to the other header files that Watcom behaviour 137# using Watcom. This indicates to the other header files that Watcom behaviour
138# is required where appropriate. 138# is required where appropriate.
139 139
140@#ifdef __WATCOMC__ 140@#ifdef __WATCOMC__
141@# ifndef PNG_API_RULE 141@# ifndef PNG_API_RULE
142@# define PNG_API_RULE 2 /* Use Watcom calling conventions */ 142@# define PNG_API_RULE 2 /* Use Watcom calling conventions */
143@# endif 143@# endif
144@#endif 144@#endif
145 145
146# Note that PNG_USR_CONFIG only has an effect when building 146# Note that PNG_USR_CONFIG only has an effect when building
147# pnglibconf.h 147# pnglibconf.h
148 148
149setting USER_CONFIG 149setting USER_CONFIG
150setting USER_PRIVATEBUILD 150setting USER_PRIVATEBUILD
151setting USER_DLLFNAME_POSTFIX 151setting USER_DLLFNAME_POSTFIX
152setting USER_VERSIONINFO_COMMENTS 152setting USER_VERSIONINFO_COMMENTS
153setting USER_VERSIONINFO_COMPANYNAME 153setting USER_VERSIONINFO_COMPANYNAME
154setting USER_VERSIONINFO_LEGALTRADEMARKS 154setting USER_VERSIONINFO_LEGALTRADEMARKS
155 155
156# Record the 'API rule' used to select calling conventions on 156# Record the 'API rule' used to select calling conventions on
157# those systems that support such things (see all the comments in 157# those systems that support such things (see all the comments in
158# pngconf.h) 158# pngconf.h)
159# Changing this setting has a fundamental affect on the PNG ABI, 159# Changing this setting has a fundamental affect on the PNG ABI,
160# do not release shared libraries with this changed. 160# do not release shared libraries with this changed.
161 161
162setting API_RULE default 0 162setting API_RULE default 0
163 163
164# Default to using the read macros 164# Default to using the read macros
165 165
166setting DEFAULT_READ_MACROS default 1 166setting DEFAULT_READ_MACROS default 1
167 167
168# The alternative is to call functions to read PNG values, if 168# The alternative is to call functions to read PNG values, if
169# the functions are turned *off* the read macros must always 169# the functions are turned *off* the read macros must always
170# be enabled, so turning this off will actually force the 170# be enabled, so turning this off will actually force the
171# USE_READ_MACROS option on (see pngconf.h) 171# USE_READ_MACROS option on (see pngconf.h)
172 172
173option READ_INT_FUNCTIONS requires READ 173option READ_INT_FUNCTIONS requires READ
174 174
175# The same for write, but these can only be switched off if 175# The same for write, but these can only be switched off if
176# no writing is required at all - hence the use of an 'enables' 176# no writing is required at all - hence the use of an 'enables'
177# not a 'requires' below: 177# not a 'requires' below:
178 178
179option WRITE_INT_FUNCTIONS disabled 179option WRITE_INT_FUNCTIONS disabled
180option WRITE enables WRITE_INT_FUNCTIONS 180option WRITE enables WRITE_INT_FUNCTIONS
181 181
182# Generic options - affect both read and write. 182# Generic options - affect both read and write.
183 183
184option WARNINGS 184option WARNINGS
185option BENIGN_ERRORS 185option BENIGN_ERRORS
186option MNG_FEATURES 186option MNG_FEATURES
187 187
188# Arithmetic options, the first is the big switch that chooses between internal 188# Arithmetic options, the first is the big switch that chooses between internal
189# floating and fixed point arithmetic implementations - it does not affect any 189# floating and fixed point arithmetic implementations - it does not affect any
190# APIs. The second two (the _POINT settings) switch off individual APIs. 190# APIs. The second two (the _POINT settings) switch off individual APIs.
191 191
192option FLOATING_ARITHMETIC 192option FLOATING_ARITHMETIC
193option FLOATING_POINT enables ok_math 193option FLOATING_POINT enables ok_math
194option FIXED_POINT enables ok_math 194option FIXED_POINT enables ok_math
195 195
196# Added at libpng version 1.4.0 196# Added at libpng version 1.4.0
197 197
198option ERROR_TEXT 198option ERROR_TEXT
199 199
200# The following is always on (defined empty) 200# The following is always on (defined empty)
201 201
202setting CALLOC_SUPPORTED default 202setting CALLOC_SUPPORTED default
203 203
204# This protects us against compilers that run on a windowing system 204# This protects us against compilers that run on a windowing system
205# and thus don't have or would rather us not use the stdio types: 205# and thus don't have or would rather us not use the stdio types:
206# stdin, stdout, and stderr. The only one currently used is stderr 206# stdin, stdout, and stderr. The only one currently used is stderr
207# in png_error() and png_warning(). #defining PNG_NO_CONSOLE_IO will 207# in png_error() and png_warning(). #defining PNG_NO_CONSOLE_IO will
208# prevent these from being compiled and used. #defining PNG_NO_STDIO 208# prevent these from being compiled and used. #defining PNG_NO_STDIO
209# will also prevent these, plus will prevent the entire set of stdio 209# will also prevent these, plus will prevent the entire set of stdio
210# macros and functions (FILE *, printf, etc.) from being compiled and used, 210# macros and functions (FILE *, printf, etc.) from being compiled and used,
211# unless (PNG_DEBUG > 0) has been #defined. 211# unless (PNG_DEBUG > 0) has been #defined.
212 212
213option STDIO 213option STDIO
214option CONSOLE_IO requires STDIO 214option CONSOLE_IO requires STDIO
215 215
216# Note: prior to 1.5.0 this option could not be disabled if STDIO 216# Note: prior to 1.5.0 this option could not be disabled if STDIO
217# was enabled. Prior to 1.5.3 this option required STDIO 217# was enabled. Prior to 1.5.3 this option required STDIO
218 218
219option TIME_RFC1123 219option TIME_RFC1123
220 220
221# PNG_SETJMP_NOT_SUPPORTED is an old equivalent for NO_SETJMP 221# PNG_SETJMP_NOT_SUPPORTED is an old equivalent for NO_SETJMP
222 222
223option SETJMP 223option SETJMP
224= NO_SETJMP SETJMP_NOT_SUPPORTED 224= NO_SETJMP SETJMP_NOT_SUPPORTED
225 225
226# For the moment this is disabled (no code support): 226# For the moment this is disabled (no code support):
227 227
228option ERROR_NUMBERS disabled 228option ERROR_NUMBERS disabled
229 229
230# If this is disabled it is not possible for apps to get the 230# If this is disabled it is not possible for apps to get the
231# values from the 'info' structure, this effectively removes 231# values from the 'info' structure, this effectively removes
232# quite a lot of the READ API. 232# quite a lot of the READ API.
233 233
234option EASY_ACCESS 234option EASY_ACCESS
235 235
236# Added at libpng-1.2.0 236# Added at libpng-1.2.0
237 237
238option USER_MEM 238option USER_MEM
239 239
240# Added at libpng-1.4.0 240# Added at libpng-1.4.0
241 241
242option IO_STATE 242option IO_STATE
243 243
244# This is only for PowerPC big-endian and 680x0 systems 244# This is only for PowerPC big-endian and 680x0 systems
245# some testing, not enabled by default. 245# some testing, not enabled by default.
246# NO LONGER USED 246# NO LONGER USED
247 247
248#option READ_BIG_ENDIAN disabled 248#option READ_BIG_ENDIAN disabled
249 249
250# Allow users to control limits on what the READ code will 250# Allow users to control limits on what the READ code will
251# read: 251# read:
252 252
253# Added at libpng-1.2.43; adds limit fields to png_struct, 253# Added at libpng-1.2.43; adds limit fields to png_struct,
254# allows some usages of these fields 254# allows some usages of these fields
255 255
256option USER_LIMITS 256option USER_LIMITS
257 257
258# Added at libpng-1.2.6; adds setting APIs, allows additional 258# Added at libpng-1.2.6; adds setting APIs, allows additional
259# usage of this field (UTSL) 259# usage of this field (UTSL)
260 260
261option SET_USER_LIMITS requires USER_LIMITS 261option SET_USER_LIMITS requires USER_LIMITS
262 262
263# Feature added at libpng-1.4.0, this flag added at 1.4.1 263# Feature added at libpng-1.4.0, this flag added at 1.4.1
264option SET_USER_LIMITS enables SET_CHUNK_CACHE_LIMIT 264option SET_USER_LIMITS enables SET_CHUNK_CACHE_LIMIT
265# Feature added at libpng-1.4.1, this flag added at 1.4.1 265# Feature added at libpng-1.4.1, this flag added at 1.4.1
266 266
267option SET_USER_LIMITS enables SET_CHUNK_MALLOC_LIMIT 267option SET_USER_LIMITS enables SET_CHUNK_MALLOC_LIMIT
268 268
269# Added at libpng-1.0.16 and 1.2.6. To accept all valid PNGs no matter 269# Added at libpng-1.0.16 and 1.2.6. To accept all valid PNGs no matter
270# how large, set these two limits to 0x7fffffff 270# how large, set these two limits to 0x7fffffff
271 271
272setting USER_WIDTH_MAX default 1000000 272setting USER_WIDTH_MAX default 1000000
273setting USER_HEIGHT_MAX default 1000000 273setting USER_HEIGHT_MAX default 1000000
274 274
275# Added at libpng-1.2.43. To accept all valid PNGs no matter 275# Added at libpng-1.2.43. To accept all valid PNGs no matter
276# how large, set these two limits to 0. 276# how large, set these two limits to 0.
277 277
278setting USER_CHUNK_CACHE_MAX default 0 278setting USER_CHUNK_CACHE_MAX default 0
279 279
280# Added at libpng-1.2.43 280# Added at libpng-1.2.43
281 281
282setting USER_CHUNK_MALLOC_MAX default 0 282setting USER_CHUNK_MALLOC_MAX default 0
283 283
284# All of the following options relate to code capabilities for 284# All of the following options relate to code capabilities for
285# processing image data before creating a PNG or after reading one. 285# processing image data before creating a PNG or after reading one.
286# You can remove these capabilities safely and still be PNG 286# You can remove these capabilities safely and still be PNG
287# conformant, however the library that results is still non-standard. 287# conformant, however the library that results is still non-standard.
288# See the comments above about how to change options and settings. 288# See the comments above about how to change options and settings.
289 289
290# READ options 290# READ options
291 291
292option READ enables READ_INTERLACING 292option READ enables READ_INTERLACING
293 293
294# Disabling READ_16BIT does not disable reading 16-bit PNG files, but it 294# Disabling READ_16BIT does not disable reading 16-bit PNG files, but it
295# forces them to be chopped down to 8-bit, and disables any 16-bit 295# forces them to be chopped down to 8-bit, and disables any 16-bit
296# processing after that has happened. You need to be sure to enable 296# processing after that has happened. You need to be sure to enable
297# READ_SCALE_16_TO_8 or READ_STRIP_16_TO_8 when you disable READ_16BIT for 297# READ_SCALE_16_TO_8 or READ_STRIP_16_TO_8 when you disable READ_16BIT for
298# this to work properly. You should disable the other option if you need to 298# this to work properly. You should disable the other option if you need to
299# ensure a particular conversion (otherwise the app can chose.) 299# ensure a particular conversion (otherwise the app can chose.)
300 300
301option READ_16BIT requires READ enables 16BIT 301option READ_16BIT requires READ enables 16BIT
302 302
303option READ_QUANTIZE requires READ 303option READ_QUANTIZE requires READ
304 304
305option READ_TRANSFORMS requires READ 305option READ_TRANSFORMS requires READ
306= NO_READ_TRANSFORMS READ_TRANSFORMS_NOT_SUPPORTED 306= NO_READ_TRANSFORMS READ_TRANSFORMS_NOT_SUPPORTED
307 307
308option READ_EXPAND requires READ_TRANSFORMS 308option READ_EXPAND requires READ_TRANSFORMS
309option READ_EXPAND_16 requires READ_TRANSFORMS READ_16BIT enables READ_EXPAND 309option READ_EXPAND_16 requires READ_TRANSFORMS READ_16BIT enables READ_EXPAND
310option READ_SHIFT requires READ_TRANSFORMS 310option READ_SHIFT requires READ_TRANSFORMS
311option READ_PACK requires READ_TRANSFORMS 311option READ_PACK requires READ_TRANSFORMS
312option READ_BGR requires READ_TRANSFORMS 312option READ_BGR requires READ_TRANSFORMS
313option READ_SWAP requires READ_TRANSFORMS READ_16BIT 313option READ_SWAP requires READ_TRANSFORMS READ_16BIT
314option READ_PACKSWAP requires READ_TRANSFORMS 314option READ_PACKSWAP requires READ_TRANSFORMS
315option READ_INVERT requires READ_TRANSFORMS 315option READ_INVERT requires READ_TRANSFORMS
316option READ_BACKGROUND requires READ_TRANSFORMS enables READ_STRIP_ALPHA 316option READ_BACKGROUND requires READ_TRANSFORMS enables READ_STRIP_ALPHA
317option READ_STRIP_16_TO_8 requires READ_TRANSFORMS 317option READ_STRIP_16_TO_8 requires READ_TRANSFORMS
318option READ_SCALE_16_TO_8 requires READ_TRANSFORMS 318option READ_SCALE_16_TO_8 requires READ_TRANSFORMS
319option READ_FILLER requires READ_TRANSFORMS 319option READ_FILLER requires READ_TRANSFORMS
320option READ_GAMMA requires READ_TRANSFORMS enables READ_gAMA 320option READ_GAMMA requires READ_TRANSFORMS enables READ_gAMA
321option READ_GRAY_TO_RGB requires READ_TRANSFORMS 321option READ_GRAY_TO_RGB requires READ_TRANSFORMS
322 322
323option READ_ALPHA_MODE requires READ_TRANSFORMS enables READ_GAMMA 323option READ_ALPHA_MODE requires READ_TRANSFORMS enables READ_GAMMA
324option READ_SWAP_ALPHA requires READ_TRANSFORMS 324option READ_SWAP_ALPHA requires READ_TRANSFORMS
325option READ_INVERT_ALPHA requires READ_TRANSFORMS 325option READ_INVERT_ALPHA requires READ_TRANSFORMS
326option READ_STRIP_ALPHA requires READ_TRANSFORMS 326option READ_STRIP_ALPHA requires READ_TRANSFORMS
327option READ_USER_TRANSFORM requires READ_TRANSFORMS 327option READ_USER_TRANSFORM requires READ_TRANSFORMS
328option READ_RGB_TO_GRAY requires READ_TRANSFORMS 328option READ_RGB_TO_GRAY requires READ_TRANSFORMS
329 329
330option PROGRESSIVE_READ requires READ 330option PROGRESSIVE_READ requires READ
331option SEQUENTIAL_READ requires READ 331option SEQUENTIAL_READ requires READ
332 332
333# You can define PNG_NO_PROGRESSIVE_READ if you don't do progressive reading. 333# You can define PNG_NO_PROGRESSIVE_READ if you don't do progressive reading.
334# This is not talking about interlacing capability! You'll still have 334# This is not talking about interlacing capability! You'll still have
335# interlacing unless you turn off the following which is required 335# interlacing unless you turn off the following which is required
336# for PNG-compliant decoders. (In other words, do not do this - in 336# for PNG-compliant decoders. (In other words, do not do this - in
337# fact it can't be disabled from the command line!) 337# fact it can't be disabled from the command line!)
338#option READ_INTERLACING requires READ 338#option READ_INTERLACING requires READ
339 339
340option READ_COMPOSITE_NODIV requires READ 340option READ_COMPOSITE_NODIV requires READ
341= NO_READ_COMPOSITE_NODIV NO_READ_COMPOSITED_NODIV 341= NO_READ_COMPOSITE_NODIV NO_READ_COMPOSITED_NODIV
342 342
343# Inch conversions 343# Inch conversions
344 344
345option INCH_CONVERSIONS 345option INCH_CONVERSIONS
346= INCH_CONVERSIONS INCH_CONVERSIONS 346= INCH_CONVERSIONS INCH_CONVERSIONS
347 347
348# API to build a grayscale palette 348# API to build a grayscale palette
349 349
350option BUILD_GRAYSCALE_PALETTE 350option BUILD_GRAYSCALE_PALETTE
351 351
352# IN DEVELOPMENT 352# IN DEVELOPMENT
353# These are currently experimental features; define them if you want 353# These are currently experimental features; define them if you want
354 354
355# NOTHING HERE 355# NOTHING HERE
356 356
357# WRITE options 357# WRITE options
358 358
359option WRITE 359option WRITE
360 360
361# Disabling WRITE_16BIT prevents 16-bit PNG files from being 361# Disabling WRITE_16BIT prevents 16-bit PNG files from being
362# generated. 362# generated.
363option WRITE_16BIT requires WRITE enables 16BIT 363option WRITE_16BIT requires WRITE enables 16BIT
364 364
365option WRITE_TRANSFORMS requires WRITE 365option WRITE_TRANSFORMS requires WRITE
366= NO_WRITE_TRANSFORMS WRITE_TRANSFORMS_NOT_SUPPORTED 366= NO_WRITE_TRANSFORMS WRITE_TRANSFORMS_NOT_SUPPORTED
367 367
368option WRITE_SHIFT requires WRITE_TRANSFORMS 368option WRITE_SHIFT requires WRITE_TRANSFORMS
369option WRITE_PACK requires WRITE_TRANSFORMS 369option WRITE_PACK requires WRITE_TRANSFORMS
370option WRITE_BGR requires WRITE_TRANSFORMS 370option WRITE_BGR requires WRITE_TRANSFORMS
371option WRITE_SWAP requires WRITE_TRANSFORMS WRITE_16BIT 371option WRITE_SWAP requires WRITE_TRANSFORMS WRITE_16BIT
372option WRITE_PACKSWAP requires WRITE_TRANSFORMS 372option WRITE_PACKSWAP requires WRITE_TRANSFORMS
373option WRITE_INVERT requires WRITE_TRANSFORMS 373option WRITE_INVERT requires WRITE_TRANSFORMS
374option WRITE_FILLER requires WRITE_TRANSFORMS 374option WRITE_FILLER requires WRITE_TRANSFORMS
375option WRITE_SWAP_ALPHA requires WRITE_TRANSFORMS 375option WRITE_SWAP_ALPHA requires WRITE_TRANSFORMS
376option WRITE_INVERT_ALPHA requires WRITE_TRANSFORMS 376option WRITE_INVERT_ALPHA requires WRITE_TRANSFORMS
377option WRITE_USER_TRANSFORM requires WRITE_TRANSFORMS 377option WRITE_USER_TRANSFORM requires WRITE_TRANSFORMS
378 378
379# This is not required for PNG-compliant encoders, but can cause 379# This is not required for PNG-compliant encoders, but can cause
380# trouble if left undefined 380# trouble if left undefined
381 381
382option WRITE_INTERLACING requires WRITE 382option WRITE_INTERLACING requires WRITE
383 383
384# The following depends, internally, on WEIGHT_SHIFT and COST_SHIFT 384# The following depends, internally, on WEIGHT_SHIFT and COST_SHIFT
385# where are set below. 385# where are set below.
386 386
387option WRITE_WEIGHTED_FILTER requires WRITE 387option WRITE_WEIGHTED_FILTER requires WRITE
388 388
389option WRITE_FLUSH requires WRITE 389option WRITE_FLUSH requires WRITE
390 390
391# Note: these can be turned off explicitly if not required by the 391# Note: these can be turned off explicitly if not required by the
392# apps implementing the user transforms 392# apps implementing the user transforms
393option USER_TRANSFORM_PTR if READ_USER_TRANSFORM WRITE_USER_TRANSFORM 393option USER_TRANSFORM_PTR if READ_USER_TRANSFORM WRITE_USER_TRANSFORM
394option USER_TRANSFORM_INFO if READ_USER_TRANSFORM WRITE_USER_TRANSFORM 394option USER_TRANSFORM_INFO if READ_USER_TRANSFORM WRITE_USER_TRANSFORM
395 395
396# This enables API to set compression parameters for compressing 396# This enables API to set compression parameters for compressing
397# non-IDAT chunks (zTXt, iTXt, iCCP, and unknown chunks). This feature 397# non-IDAT chunks (zTXt, iTXt, iCCP, and unknown chunks). This feature
398# was added at libpng-1.5.3. 398# was added at libpng-1.5.3.
399option WRITE_CUSTOMIZE_ZTXT_COMPRESSION requires WRITE 399option WRITE_CUSTOMIZE_ZTXT_COMPRESSION requires WRITE
400 400
401# Any chunks you are not interested in, you can undef here. The 401# Any chunks you are not interested in, you can undef here. The
402# ones that allocate memory may be expecially important (hIST, 402# ones that allocate memory may be expecially important (hIST,
403# tEXt, zTXt, tRNS, pCAL). Others will just save time and make png_info 403# tEXt, zTXt, tRNS, pCAL). Others will just save time and make png_info
404# a bit smaller. 404# a bit smaller.
405 405
406# The size of the png_text structure changed in libpng-1.0.6 when 406# The size of the png_text structure changed in libpng-1.0.6 when
407# iTXt support was added. iTXt support was turned off by default through 407# iTXt support was added. iTXt support was turned off by default through
408# libpng-1.2.x, to support old apps that malloc the png_text structure 408# libpng-1.2.x, to support old apps that malloc the png_text structure
409# instead of calling png_set_text() and letting libpng malloc it. It 409# instead of calling png_set_text() and letting libpng malloc it. It
410# was turned on by default in libpng-1.4.0. 410# was turned on by default in libpng-1.4.0.
411 411
412option READ_ANCILLARY_CHUNKS requires READ 412option READ_ANCILLARY_CHUNKS requires READ
413# PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated. 413# PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated.
414= NO_READ_ANCILLARY_CHUNKS READ_ANCILLARY_CHUNKS_NOT_SUPPORTED 414= NO_READ_ANCILLARY_CHUNKS READ_ANCILLARY_CHUNKS_NOT_SUPPORTED
415 415
416option WRITE_ANCILLARY_CHUNKS requires WRITE 416option WRITE_ANCILLARY_CHUNKS requires WRITE
417# PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated. 417# PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated.
418= NO_WRITE_ANCILLARY_CHUNKS WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED 418= NO_WRITE_ANCILLARY_CHUNKS WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED
419 419
420# These options disable *all* the text chunks if turned off 420# These options disable *all* the text chunks if turned off
421 421
422option READ_TEXT requires READ_ANCILLARY_CHUNKS enables TEXT 422option READ_TEXT requires READ_ANCILLARY_CHUNKS enables TEXT
423option WRITE_TEXT requires WRITE_ANCILLARY_CHUNKS enables TEXT 423option WRITE_TEXT requires WRITE_ANCILLARY_CHUNKS enables TEXT
424 424
425# Moved to pnglibconf.h at libpng-1.5.0 425# Moved to pnglibconf.h at libpng-1.5.0
426# Feature support: in 1.4 this was in pngconf.h, but the following 426# Feature support: in 1.4 this was in pngconf.h, but the following
427# features have no affect on the libpng API. Add library 427# features have no affect on the libpng API. Add library
428# only features to the end of this list. Add features that 428# only features to the end of this list. Add features that
429# affect the API above. (Note: the list of chunks follows 429# affect the API above. (Note: the list of chunks follows
430# the library-only settings.) 430# the library-only settings.)
431# 431#
432# BUILD TIME ONLY OPTIONS 432# BUILD TIME ONLY OPTIONS
433# These options do not affect the API but rather alter how the 433# These options do not affect the API but rather alter how the
434# API is implemented, they get recorded in pnglibconf.h, but 434# API is implemented, they get recorded in pnglibconf.h, but
435# can't be changed by the application. 435# can't be changed by the application.
436 436
437# Check the correctness of cHRM chunks 437# Check the correctness of cHRM chunks
438 438
439option CHECK_cHRM requires cHRM 439option CHECK_cHRM requires cHRM
440 440
441# 441#
442# Artificially align memory - the code typically aligns to 8 byte 442# Artificially align memory - the code typically aligns to 8 byte
443# boundaries if this is switched on, it's a small waste of space 443# boundaries if this is switched on, it's a small waste of space
444# but can help (in theory) on some architectures. Only affects 444# but can help (in theory) on some architectures. Only affects
445# internal structures. Added at libpng 1.4.0 445# internal structures. Added at libpng 1.4.0
446 446
447option ALIGN_MEMORY 447option ALIGN_MEMORY
448 448
449# Buggy compilers (e.g., gcc 2.7.2.2) need PNG_NO_POINTER_INDEXING 449# Buggy compilers (e.g., gcc 2.7.2.2) need PNG_NO_POINTER_INDEXING
450# See png[wr]util.c, normally this should always be *on* 450# See png[wr]util.c, normally this should always be *on*
451 451
452option POINTER_INDEXING 452option POINTER_INDEXING
453 453
454# Other defines for things like memory and the like can go here. 454# Other defines for things like memory and the like can go here.
455 455
456# BUILD TIME SETTINGS 456# BUILD TIME SETTINGS
457# Like build time options these do not affect the API, but they 457# Like build time options these do not affect the API, but they
458# may be useful to applications because they record details of 458# may be useful to applications because they record details of
459# how the API will behave particularly with regard to overall 459# how the API will behave particularly with regard to overall
460# accuracy. 460# accuracy.
461 461
462# This controls how fine the quantizing gets. As this allocates 462# This controls how fine the quantizing gets. As this allocates
463# a largish chunk of memory (32K), those who are not as concerned 463# a largish chunk of memory (32K), those who are not as concerned
464# with quantizing quality can decrease some or all of these. 464# with quantizing quality can decrease some or all of these.
465 465
466setting QUANTIZE_RED_BITS default 5 466setting QUANTIZE_RED_BITS default 5
467setting QUANTIZE_GREEN_BITS default 5 467setting QUANTIZE_GREEN_BITS default 5
468setting QUANTIZE_BLUE_BITS default 5 468setting QUANTIZE_BLUE_BITS default 5
469 469
470# This controls how fine the gamma correction becomes when you 470# This controls how fine the gamma correction becomes when you
471# are only interested in 8 bits anyway. Increasing this value 471# are only interested in 8 bits anyway. Increasing this value
472# results in more memory being used, and more pow() functions 472# results in more memory being used, and more pow() functions
473# being called to fill in the gamma tables. Don't set this value 473# being called to fill in the gamma tables. Don't set this value
474# less then 8, and even that may not work (I haven't tested it). 474# less then 8, and even that may not work (I haven't tested it).
475 475
476setting MAX_GAMMA_8 default 11 476setting MAX_GAMMA_8 default 11
477 477
478# This controls how much a difference in gamma we can tolerate before 478# This controls how much a difference in gamma we can tolerate before
479# we actually start doing gamma conversion, it's a fixed point value, 479# we actually start doing gamma conversion, it's a fixed point value,
480# so the default below is 0.05, meaning libpng ignores corrections in 480# so the default below is 0.05, meaning libpng ignores corrections in
481# the range 0.95 to 1.05 481# the range 0.95 to 1.05
482 482
483setting GAMMA_THRESHOLD_FIXED default 5000 483setting GAMMA_THRESHOLD_FIXED default 5000
484 484
485# Scaling factor for filter heuristic weighting calculations 485# Scaling factor for filter heuristic weighting calculations
486 486
487setting WEIGHT_SHIFT default 8 487setting WEIGHT_SHIFT default 8
488setting COST_SHIFT default 3 488setting COST_SHIFT default 3
489 489
490# Precision to use when converting a floating point value to a PNG 490# Precision to use when converting a floating point value to a PNG
491# extension format string in an sCAL chunk (only relevant if the 491# extension format string in an sCAL chunk (only relevant if the
492# floating point API is enabled) 492# floating point API is enabled)
493 493
494setting sCAL_PRECISION default 5 494setting sCAL_PRECISION default 5
495 495
496# This is the size of the compression buffer, and thus the size of 496# This is the size of the compression buffer, and thus the size of
497# an IDAT chunk. Make this whatever size you feel is best for your 497# an IDAT chunk. Make this whatever size you feel is best for your
498# machine. One of these will be allocated per png_struct. When this 498# machine. One of these will be allocated per png_struct. When this
499# is full, it writes the data to the disk, and does some other 499# is full, it writes the data to the disk, and does some other
500# calculations. Making this an extremely small size may slow 500# calculations. Making this an extremely small size may slow
501# the library down, but you may want to experiment to determine 501# the library down, but you may want to experiment to determine
502# where it becomes significant, if you are concerned with memory 502# where it becomes significant, if you are concerned with memory
503# usage. Note that zlib allocates at least 32Kb also. For readers, 503# usage. Note that zlib allocates at least 32Kb also. For readers,
504# this describes the size of the buffer available to read the data in. 504# this describes the size of the buffer available to read the data in.
505# Unless this gets smaller than the size of a row (compressed), 505# Unless this gets smaller than the size of a row (compressed),
506# it should not make much difference how big this is. 506# it should not make much difference how big this is.
507 507
508setting ZBUF_SIZE default 8192 508setting ZBUF_SIZE default 8192
509 509
510# Ancillary chunks 510# Ancillary chunks
511chunk bKGD 511chunk bKGD
512chunk cHRM 512chunk cHRM
513chunk gAMA 513chunk gAMA
514chunk hIST 514chunk hIST
515chunk iCCP 515chunk iCCP
516chunk iTXt 516chunk iTXt
517chunk oFFs 517chunk oFFs
518chunk pCAL 518chunk pCAL
519chunk sCAL 519chunk sCAL
520chunk pHYs 520chunk pHYs
521chunk sBIT 521chunk sBIT
522chunk sPLT 522chunk sPLT
523chunk sRGB 523chunk sRGB
524chunk tEXt requires TEXT 524chunk tEXt requires TEXT
525chunk tIME 525chunk tIME
526chunk tRNS 526chunk tRNS
527chunk zTXt 527chunk zTXt
528 528
529# This only affects support of the optional PLTE chunk in RGB and RGBA 529# This only affects support of the optional PLTE chunk in RGB and RGBA
530# images. Notice that READ_ANCILLARY_CHUNKS therefore disables part 530# images. Notice that READ_ANCILLARY_CHUNKS therefore disables part
531# of the regular chunk reading too. 531# of the regular chunk reading too.
532 532
533option READ_OPT_PLTE requires READ_ANCILLARY_CHUNKS 533option READ_OPT_PLTE requires READ_ANCILLARY_CHUNKS
534 534
535option READ_UNKNOWN_CHUNKS requires READ 535option READ_UNKNOWN_CHUNKS requires READ
536option READ_UNKNOWN_CHUNKS enables UNKNOWN_CHUNKS READ_USER_CHUNKS 536option READ_UNKNOWN_CHUNKS enables UNKNOWN_CHUNKS READ_USER_CHUNKS
537option READ_USER_CHUNKS requires READ enables USER_CHUNKS 537option READ_USER_CHUNKS requires READ enables USER_CHUNKS
538 538
539option CONVERT_tIME requires WRITE_ANCILLARY_CHUNKS 539option CONVERT_tIME requires WRITE_ANCILLARY_CHUNKS
540# The "tm" structure is not supported on WindowsCE 540# The "tm" structure is not supported on WindowsCE
541 541
542@#ifdef _WIN32_WCE 542@#ifdef _WIN32_WCE
543@# define PNG_NO_CONVERT_tIME 543@# define PNG_NO_CONVERT_tIME
544@#endif 544@#endif
545 545
546option WRITE_FILTER requires WRITE 546option WRITE_FILTER requires WRITE
547 547
548option WRITE_UNKNOWN_CHUNKS requires WRITE 548option WRITE_UNKNOWN_CHUNKS requires WRITE
549 549
550option HANDLE_AS_UNKNOWN 550option HANDLE_AS_UNKNOWN
551 551
552option SAVE_INT_32 requires WRITE 552option SAVE_INT_32 requires WRITE
553 553
554# png_save_int_32 is required by the ancillary chunks oFFs and pCAL 554# png_save_int_32 is required by the ancillary chunks oFFs and pCAL
555 555
556# added at libpng-1.5.4 556# added at libpng-1.5.4
557 557
558option WRITE_OPTIMIZE_CMF requires WRITE 558option WRITE_OPTIMIZE_CMF requires WRITE
559 559
560option READ_COMPRESSED_TEXT disabled 560option READ_COMPRESSED_TEXT disabled
561option READ_iCCP enables READ_COMPRESSED_TEXT 561option READ_iCCP enables READ_COMPRESSED_TEXT
562option READ_iTXt enables READ_COMPRESSED_TEXT 562option READ_iTXt enables READ_COMPRESSED_TEXT
563option READ_zTXt enables READ_COMPRESSED_TEXT 563option READ_zTXt enables READ_COMPRESSED_TEXT
564option READ_COMPRESSED_TEXT enables READ_TEXT 564option READ_COMPRESSED_TEXT enables READ_TEXT
565 565
566option WRITE_oFFs enables SAVE_INT_32 566option WRITE_oFFs enables SAVE_INT_32
567option WRITE_pCAL enables SAVE_INT_32 567option WRITE_pCAL enables SAVE_INT_32
568 568
569option WRITE_COMPRESSED_TEXT disabled 569option WRITE_COMPRESSED_TEXT disabled
570option WRITE_iCCP enables WRITE_COMPRESSED_TEXT 570option WRITE_iCCP enables WRITE_COMPRESSED_TEXT
571option WRITE_iTXt enables WRITE_COMPRESSED_TEXT 571option WRITE_iTXt enables WRITE_COMPRESSED_TEXT
572option WRITE_zTXt enables WRITE_COMPRESSED_TEXT 572option WRITE_zTXt enables WRITE_COMPRESSED_TEXT
573option WRITE_COMPRESSED_TEXT enables WRITE_TEXT 573option WRITE_COMPRESSED_TEXT enables WRITE_TEXT
574 574
575# Turn this off to disable png_read_png() and png_write_png() and 575# Turn this off to disable png_read_png() and png_write_png() and
576# leave the row_pointers member out of the info structure. 576# leave the row_pointers member out of the info structure.
577 577
578option INFO_IMAGE 578option INFO_IMAGE
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.h.prebuilt b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.h.prebuilt
index 36447ce..49fcc8c 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.h.prebuilt
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.h.prebuilt
@@ -1,187 +1,187 @@
1 1
2/* libpng STANDARD API DEFINITION */ 2/* libpng STANDARD API DEFINITION */
3 3
4/* pnglibconf.h - library build configuration */ 4/* pnglibconf.h - library build configuration */
5 5
6/* Libpng 1.5.9 - February 18, 2012 */ 6/* Libpng 1.5.9 - February 18, 2012 */
7 7
8/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */ 8/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
9 9
10/* This code is released under the libpng license. */ 10/* This code is released under the libpng license. */
11/* For conditions of distribution and use, see the disclaimer */ 11/* For conditions of distribution and use, see the disclaimer */
12/* and license in png.h */ 12/* and license in png.h */
13 13
14/* pnglibconf.h */ 14/* pnglibconf.h */
15/* Derived from: scripts/pnglibconf.dfa */ 15/* Derived from: scripts/pnglibconf.dfa */
16/* If you edit this file by hand you must obey the rules expressed in */ 16/* If you edit this file by hand you must obey the rules expressed in */
17/* pnglibconf.dfa with respect to the dependencies between the following */ 17/* pnglibconf.dfa with respect to the dependencies between the following */
18/* symbols. It is much better to generate a new file using */ 18/* symbols. It is much better to generate a new file using */
19/* scripts/libpngconf.mak */ 19/* scripts/libpngconf.mak */
20 20
21#ifndef PNGLCONF_H 21#ifndef PNGLCONF_H
22#define PNGLCONF_H 22#define PNGLCONF_H
23/* settings */ 23/* settings */
24#define PNG_API_RULE 0 24#define PNG_API_RULE 0
25#define PNG_CALLOC_SUPPORTED 25#define PNG_CALLOC_SUPPORTED
26#define PNG_COST_SHIFT 3 26#define PNG_COST_SHIFT 3
27#define PNG_DEFAULT_READ_MACROS 1 27#define PNG_DEFAULT_READ_MACROS 1
28#define PNG_GAMMA_THRESHOLD_FIXED 5000 28#define PNG_GAMMA_THRESHOLD_FIXED 5000
29#define PNG_MAX_GAMMA_8 11 29#define PNG_MAX_GAMMA_8 11
30#define PNG_QUANTIZE_BLUE_BITS 5 30#define PNG_QUANTIZE_BLUE_BITS 5
31#define PNG_QUANTIZE_GREEN_BITS 5 31#define PNG_QUANTIZE_GREEN_BITS 5
32#define PNG_QUANTIZE_RED_BITS 5 32#define PNG_QUANTIZE_RED_BITS 5
33#define PNG_sCAL_PRECISION 5 33#define PNG_sCAL_PRECISION 5
34#define PNG_USER_CHUNK_CACHE_MAX 0 34#define PNG_USER_CHUNK_CACHE_MAX 0
35#define PNG_USER_CHUNK_MALLOC_MAX 0 35#define PNG_USER_CHUNK_MALLOC_MAX 0
36#define PNG_USER_HEIGHT_MAX 1000000 36#define PNG_USER_HEIGHT_MAX 1000000
37#define PNG_USER_WIDTH_MAX 1000000 37#define PNG_USER_WIDTH_MAX 1000000
38#define PNG_WEIGHT_SHIFT 8 38#define PNG_WEIGHT_SHIFT 8
39#define PNG_ZBUF_SIZE 8192 39#define PNG_ZBUF_SIZE 8192
40/* end of settings */ 40/* end of settings */
41/* options */ 41/* options */
42#define PNG_16BIT_SUPPORTED 42#define PNG_16BIT_SUPPORTED
43#define PNG_ALIGN_MEMORY_SUPPORTED 43#define PNG_ALIGN_MEMORY_SUPPORTED
44#define PNG_BENIGN_ERRORS_SUPPORTED 44#define PNG_BENIGN_ERRORS_SUPPORTED
45#define PNG_bKGD_SUPPORTED 45#define PNG_bKGD_SUPPORTED
46#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED 46#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
47#define PNG_CHECK_cHRM_SUPPORTED 47#define PNG_CHECK_cHRM_SUPPORTED
48#define PNG_cHRM_SUPPORTED 48#define PNG_cHRM_SUPPORTED
49#define PNG_CONSOLE_IO_SUPPORTED 49#define PNG_CONSOLE_IO_SUPPORTED
50#define PNG_CONVERT_tIME_SUPPORTED 50#define PNG_CONVERT_tIME_SUPPORTED
51#define PNG_EASY_ACCESS_SUPPORTED 51#define PNG_EASY_ACCESS_SUPPORTED
52/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ 52/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
53#define PNG_ERROR_TEXT_SUPPORTED 53#define PNG_ERROR_TEXT_SUPPORTED
54#define PNG_FIXED_POINT_SUPPORTED 54#define PNG_FIXED_POINT_SUPPORTED
55#define PNG_FLOATING_ARITHMETIC_SUPPORTED 55#define PNG_FLOATING_ARITHMETIC_SUPPORTED
56#define PNG_FLOATING_POINT_SUPPORTED 56#define PNG_FLOATING_POINT_SUPPORTED
57#define PNG_gAMA_SUPPORTED 57#define PNG_gAMA_SUPPORTED
58#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED 58#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
59#define PNG_hIST_SUPPORTED 59#define PNG_hIST_SUPPORTED
60#define PNG_iCCP_SUPPORTED 60#define PNG_iCCP_SUPPORTED
61#define PNG_INCH_CONVERSIONS_SUPPORTED 61#define PNG_INCH_CONVERSIONS_SUPPORTED
62#define PNG_INFO_IMAGE_SUPPORTED 62#define PNG_INFO_IMAGE_SUPPORTED
63#define PNG_IO_STATE_SUPPORTED 63#define PNG_IO_STATE_SUPPORTED
64#define PNG_iTXt_SUPPORTED 64#define PNG_iTXt_SUPPORTED
65#define PNG_MNG_FEATURES_SUPPORTED 65#define PNG_MNG_FEATURES_SUPPORTED
66#define PNG_oFFs_SUPPORTED 66#define PNG_oFFs_SUPPORTED
67#define PNG_pCAL_SUPPORTED 67#define PNG_pCAL_SUPPORTED
68#define PNG_pHYs_SUPPORTED 68#define PNG_pHYs_SUPPORTED
69#define PNG_POINTER_INDEXING_SUPPORTED 69#define PNG_POINTER_INDEXING_SUPPORTED
70#define PNG_PROGRESSIVE_READ_SUPPORTED 70#define PNG_PROGRESSIVE_READ_SUPPORTED
71#define PNG_READ_16BIT_SUPPORTED 71#define PNG_READ_16BIT_SUPPORTED
72#define PNG_READ_ALPHA_MODE_SUPPORTED 72#define PNG_READ_ALPHA_MODE_SUPPORTED
73#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED 73#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
74#define PNG_READ_BACKGROUND_SUPPORTED 74#define PNG_READ_BACKGROUND_SUPPORTED
75#define PNG_READ_BGR_SUPPORTED 75#define PNG_READ_BGR_SUPPORTED
76#define PNG_READ_bKGD_SUPPORTED 76#define PNG_READ_bKGD_SUPPORTED
77#define PNG_READ_cHRM_SUPPORTED 77#define PNG_READ_cHRM_SUPPORTED
78#define PNG_READ_COMPOSITE_NODIV_SUPPORTED 78#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
79#define PNG_READ_COMPRESSED_TEXT_SUPPORTED 79#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
80#define PNG_READ_EXPAND_16_SUPPORTED 80#define PNG_READ_EXPAND_16_SUPPORTED
81#define PNG_READ_EXPAND_SUPPORTED 81#define PNG_READ_EXPAND_SUPPORTED
82#define PNG_READ_FILLER_SUPPORTED 82#define PNG_READ_FILLER_SUPPORTED
83#define PNG_READ_gAMA_SUPPORTED 83#define PNG_READ_gAMA_SUPPORTED
84#define PNG_READ_GAMMA_SUPPORTED 84#define PNG_READ_GAMMA_SUPPORTED
85#define PNG_READ_GRAY_TO_RGB_SUPPORTED 85#define PNG_READ_GRAY_TO_RGB_SUPPORTED
86#define PNG_READ_hIST_SUPPORTED 86#define PNG_READ_hIST_SUPPORTED
87#define PNG_READ_iCCP_SUPPORTED 87#define PNG_READ_iCCP_SUPPORTED
88#define PNG_READ_INTERLACING_SUPPORTED 88#define PNG_READ_INTERLACING_SUPPORTED
89#define PNG_READ_INT_FUNCTIONS_SUPPORTED 89#define PNG_READ_INT_FUNCTIONS_SUPPORTED
90#define PNG_READ_INVERT_ALPHA_SUPPORTED 90#define PNG_READ_INVERT_ALPHA_SUPPORTED
91#define PNG_READ_INVERT_SUPPORTED 91#define PNG_READ_INVERT_SUPPORTED
92#define PNG_READ_iTXt_SUPPORTED 92#define PNG_READ_iTXt_SUPPORTED
93#define PNG_READ_oFFs_SUPPORTED 93#define PNG_READ_oFFs_SUPPORTED
94#define PNG_READ_OPT_PLTE_SUPPORTED 94#define PNG_READ_OPT_PLTE_SUPPORTED
95#define PNG_READ_PACK_SUPPORTED 95#define PNG_READ_PACK_SUPPORTED
96#define PNG_READ_PACKSWAP_SUPPORTED 96#define PNG_READ_PACKSWAP_SUPPORTED
97#define PNG_READ_pCAL_SUPPORTED 97#define PNG_READ_pCAL_SUPPORTED
98#define PNG_READ_pHYs_SUPPORTED 98#define PNG_READ_pHYs_SUPPORTED
99#define PNG_READ_QUANTIZE_SUPPORTED 99#define PNG_READ_QUANTIZE_SUPPORTED
100#define PNG_READ_RGB_TO_GRAY_SUPPORTED 100#define PNG_READ_RGB_TO_GRAY_SUPPORTED
101#define PNG_READ_sBIT_SUPPORTED 101#define PNG_READ_sBIT_SUPPORTED
102#define PNG_READ_SCALE_16_TO_8_SUPPORTED 102#define PNG_READ_SCALE_16_TO_8_SUPPORTED
103#define PNG_READ_sCAL_SUPPORTED 103#define PNG_READ_sCAL_SUPPORTED
104#define PNG_READ_SHIFT_SUPPORTED 104#define PNG_READ_SHIFT_SUPPORTED
105#define PNG_READ_sPLT_SUPPORTED 105#define PNG_READ_sPLT_SUPPORTED
106#define PNG_READ_sRGB_SUPPORTED 106#define PNG_READ_sRGB_SUPPORTED
107#define PNG_READ_STRIP_16_TO_8_SUPPORTED 107#define PNG_READ_STRIP_16_TO_8_SUPPORTED
108#define PNG_READ_STRIP_ALPHA_SUPPORTED 108#define PNG_READ_STRIP_ALPHA_SUPPORTED
109#define PNG_READ_SUPPORTED 109#define PNG_READ_SUPPORTED
110#define PNG_READ_SWAP_ALPHA_SUPPORTED 110#define PNG_READ_SWAP_ALPHA_SUPPORTED
111#define PNG_READ_SWAP_SUPPORTED 111#define PNG_READ_SWAP_SUPPORTED
112#define PNG_READ_tEXt_SUPPORTED 112#define PNG_READ_tEXt_SUPPORTED
113#define PNG_READ_TEXT_SUPPORTED 113#define PNG_READ_TEXT_SUPPORTED
114#define PNG_READ_tIME_SUPPORTED 114#define PNG_READ_tIME_SUPPORTED
115#define PNG_READ_TRANSFORMS_SUPPORTED 115#define PNG_READ_TRANSFORMS_SUPPORTED
116#define PNG_READ_tRNS_SUPPORTED 116#define PNG_READ_tRNS_SUPPORTED
117#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED 117#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
118#define PNG_READ_USER_CHUNKS_SUPPORTED 118#define PNG_READ_USER_CHUNKS_SUPPORTED
119#define PNG_READ_USER_TRANSFORM_SUPPORTED 119#define PNG_READ_USER_TRANSFORM_SUPPORTED
120#define PNG_READ_zTXt_SUPPORTED 120#define PNG_READ_zTXt_SUPPORTED
121#define PNG_SAVE_INT_32_SUPPORTED 121#define PNG_SAVE_INT_32_SUPPORTED
122#define PNG_sBIT_SUPPORTED 122#define PNG_sBIT_SUPPORTED
123#define PNG_sCAL_SUPPORTED 123#define PNG_sCAL_SUPPORTED
124#define PNG_SEQUENTIAL_READ_SUPPORTED 124#define PNG_SEQUENTIAL_READ_SUPPORTED
125#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED 125#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
126#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED 126#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
127#define PNG_SETJMP_SUPPORTED 127#define PNG_SETJMP_SUPPORTED
128#define PNG_SET_USER_LIMITS_SUPPORTED 128#define PNG_SET_USER_LIMITS_SUPPORTED
129#define PNG_sPLT_SUPPORTED 129#define PNG_sPLT_SUPPORTED
130#define PNG_sRGB_SUPPORTED 130#define PNG_sRGB_SUPPORTED
131#define PNG_STDIO_SUPPORTED 131#define PNG_STDIO_SUPPORTED
132#define PNG_tEXt_SUPPORTED 132#define PNG_tEXt_SUPPORTED
133#define PNG_TEXT_SUPPORTED 133#define PNG_TEXT_SUPPORTED
134#define PNG_TIME_RFC1123_SUPPORTED 134#define PNG_TIME_RFC1123_SUPPORTED
135#define PNG_tIME_SUPPORTED 135#define PNG_tIME_SUPPORTED
136#define PNG_tRNS_SUPPORTED 136#define PNG_tRNS_SUPPORTED
137#define PNG_UNKNOWN_CHUNKS_SUPPORTED 137#define PNG_UNKNOWN_CHUNKS_SUPPORTED
138#define PNG_USER_CHUNKS_SUPPORTED 138#define PNG_USER_CHUNKS_SUPPORTED
139#define PNG_USER_LIMITS_SUPPORTED 139#define PNG_USER_LIMITS_SUPPORTED
140#define PNG_USER_MEM_SUPPORTED 140#define PNG_USER_MEM_SUPPORTED
141#define PNG_USER_TRANSFORM_INFO_SUPPORTED 141#define PNG_USER_TRANSFORM_INFO_SUPPORTED
142#define PNG_USER_TRANSFORM_PTR_SUPPORTED 142#define PNG_USER_TRANSFORM_PTR_SUPPORTED
143#define PNG_WARNINGS_SUPPORTED 143#define PNG_WARNINGS_SUPPORTED
144#define PNG_WRITE_16BIT_SUPPORTED 144#define PNG_WRITE_16BIT_SUPPORTED
145#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED 145#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
146#define PNG_WRITE_BGR_SUPPORTED 146#define PNG_WRITE_BGR_SUPPORTED
147#define PNG_WRITE_bKGD_SUPPORTED 147#define PNG_WRITE_bKGD_SUPPORTED
148#define PNG_WRITE_cHRM_SUPPORTED 148#define PNG_WRITE_cHRM_SUPPORTED
149#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED 149#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
150#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED 150#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
151#define PNG_WRITE_FILLER_SUPPORTED 151#define PNG_WRITE_FILLER_SUPPORTED
152#define PNG_WRITE_FILTER_SUPPORTED 152#define PNG_WRITE_FILTER_SUPPORTED
153#define PNG_WRITE_FLUSH_SUPPORTED 153#define PNG_WRITE_FLUSH_SUPPORTED
154#define PNG_WRITE_gAMA_SUPPORTED 154#define PNG_WRITE_gAMA_SUPPORTED
155#define PNG_WRITE_hIST_SUPPORTED 155#define PNG_WRITE_hIST_SUPPORTED
156#define PNG_WRITE_iCCP_SUPPORTED 156#define PNG_WRITE_iCCP_SUPPORTED
157#define PNG_WRITE_INTERLACING_SUPPORTED 157#define PNG_WRITE_INTERLACING_SUPPORTED
158#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED 158#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
159#define PNG_WRITE_INVERT_ALPHA_SUPPORTED 159#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
160#define PNG_WRITE_INVERT_SUPPORTED 160#define PNG_WRITE_INVERT_SUPPORTED
161#define PNG_WRITE_iTXt_SUPPORTED 161#define PNG_WRITE_iTXt_SUPPORTED
162#define PNG_WRITE_oFFs_SUPPORTED 162#define PNG_WRITE_oFFs_SUPPORTED
163#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED 163#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
164#define PNG_WRITE_PACK_SUPPORTED 164#define PNG_WRITE_PACK_SUPPORTED
165#define PNG_WRITE_PACKSWAP_SUPPORTED 165#define PNG_WRITE_PACKSWAP_SUPPORTED
166#define PNG_WRITE_pCAL_SUPPORTED 166#define PNG_WRITE_pCAL_SUPPORTED
167#define PNG_WRITE_pHYs_SUPPORTED 167#define PNG_WRITE_pHYs_SUPPORTED
168#define PNG_WRITE_sBIT_SUPPORTED 168#define PNG_WRITE_sBIT_SUPPORTED
169#define PNG_WRITE_sCAL_SUPPORTED 169#define PNG_WRITE_sCAL_SUPPORTED
170#define PNG_WRITE_SHIFT_SUPPORTED 170#define PNG_WRITE_SHIFT_SUPPORTED
171#define PNG_WRITE_sPLT_SUPPORTED 171#define PNG_WRITE_sPLT_SUPPORTED
172#define PNG_WRITE_sRGB_SUPPORTED 172#define PNG_WRITE_sRGB_SUPPORTED
173#define PNG_WRITE_SUPPORTED 173#define PNG_WRITE_SUPPORTED
174#define PNG_WRITE_SWAP_ALPHA_SUPPORTED 174#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
175#define PNG_WRITE_SWAP_SUPPORTED 175#define PNG_WRITE_SWAP_SUPPORTED
176#define PNG_WRITE_tEXt_SUPPORTED 176#define PNG_WRITE_tEXt_SUPPORTED
177#define PNG_WRITE_TEXT_SUPPORTED 177#define PNG_WRITE_TEXT_SUPPORTED
178#define PNG_WRITE_tIME_SUPPORTED 178#define PNG_WRITE_tIME_SUPPORTED
179#define PNG_WRITE_TRANSFORMS_SUPPORTED 179#define PNG_WRITE_TRANSFORMS_SUPPORTED
180#define PNG_WRITE_tRNS_SUPPORTED 180#define PNG_WRITE_tRNS_SUPPORTED
181#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED 181#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
182#define PNG_WRITE_USER_TRANSFORM_SUPPORTED 182#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
183#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED 183#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
184#define PNG_WRITE_zTXt_SUPPORTED 184#define PNG_WRITE_zTXt_SUPPORTED
185#define PNG_zTXt_SUPPORTED 185#define PNG_zTXt_SUPPORTED
186/* end of options */ 186/* end of options */
187#endif /* PNGLCONF_H */ 187#endif /* PNGLCONF_H */
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.mak b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.mak
index 1dbb232..c04578f 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.mak
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pnglibconf.mak
@@ -1,58 +1,58 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2# pnglibconf.mak - standard make lines for pnglibconf.h 2# pnglibconf.mak - standard make lines for pnglibconf.h
3# 3#
4# These lines are copied from Makefile.am, they illustrate 4# These lines are copied from Makefile.am, they illustrate
5# how to automate the build of pnglibconf.h from scripts/pnglibconf.dfa 5# how to automate the build of pnglibconf.h from scripts/pnglibconf.dfa
6# given 'awk' and 'sed' 6# given 'awk' and 'sed'
7 7
8# Override as appropriate, these definitions can be overridden on 8# Override as appropriate, these definitions can be overridden on
9# the make command line (AWK='nawk' for example). 9# the make command line (AWK='nawk' for example).
10AWK = gawk 10AWK = gawk
11AWK = mawk 11AWK = mawk
12AWK = nawk 12AWK = nawk
13AWK = one-true-awk 13AWK = one-true-awk
14AWK = awk # Crashes on SunOS 5.10 - use 'nawk' 14AWK = awk # Crashes on SunOS 5.10 - use 'nawk'
15CPP = $(CC) -E # Does not work on SUN OS 5.10 - use /lib/cpp 15CPP = $(CC) -E # Does not work on SUN OS 5.10 - use /lib/cpp
16SED = sed 16SED = sed
17 17
18COPY = cp 18COPY = cp
19DELETE = rm -f 19DELETE = rm -f
20ECHO = echo 20ECHO = echo
21DFA_XTRA = # Appended to scripts/options.awk 21DFA_XTRA = # Appended to scripts/options.awk
22 22
23# CPPFLAGS should contain the options to control the result, 23# CPPFLAGS should contain the options to control the result,
24# but DEFS and CFLAGS are also supported here, override 24# but DEFS and CFLAGS are also supported here, override
25# as appropriate 25# as appropriate
26DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS) 26DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS)
27 27
28# srcdir is a defacto standard for the location of the source 28# srcdir is a defacto standard for the location of the source
29srcdir = . 29srcdir = .
30 30
31# The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt, 31# The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt,
32# copy this if the following doesn't work. 32# copy this if the following doesn't work.
33pnglibconf.h: pnglibconf.dfn 33pnglibconf.h: pnglibconf.dfn
34 $(DELETE) $@ dfn.c dfn1.out dfn2.out dfn3.out 34 $(DELETE) $@ dfn.c dfn1.out dfn2.out dfn3.out
35 $(ECHO) '#include "pnglibconf.dfn"' >dfn.c 35 $(ECHO) '#include "pnglibconf.dfn"' >dfn.c
36 $(CPP) $(DFNFLAGS) dfn.c >dfn1.out 36 $(CPP) $(DFNFLAGS) dfn.c >dfn1.out
37 $(ECHO) "If 'cpp -e' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2 37 $(ECHO) "If 'cpp -e' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
38 $(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\ 38 $(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\
39 dfn1.out >dfn2.out 39 dfn1.out >dfn2.out
40 $(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out 40 $(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out
41 $(COPY) dfn3.out $@ 41 $(COPY) dfn3.out $@
42 $(DELETE) dfn.c dfn1.out dfn2.out dfn3.out 42 $(DELETE) dfn.c dfn1.out dfn2.out dfn3.out
43 43
44pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h 44pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h
45 $(DELETE) $@ dfn1.out dfn2.out 45 $(DELETE) $@ dfn1.out dfn2.out
46 $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2 46 $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2
47 $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2 47 $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2
48 $(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out version=search\ 48 $(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out version=search\
49 $(srcdir)/pngconf.h $(srcdir)/scripts/pnglibconf.dfa\ 49 $(srcdir)/pngconf.h $(srcdir)/scripts/pnglibconf.dfa\
50 $(DFA_XTRA) 1>&2 50 $(DFA_XTRA) 1>&2
51 $(AWK) -f $(srcdir)/scripts/options.awk out=dfn2.out dfn1.out 1>&2 51 $(AWK) -f $(srcdir)/scripts/options.awk out=dfn2.out dfn1.out 1>&2
52 $(COPY) dfn2.out $@ 52 $(COPY) dfn2.out $@
53 $(DELETE) dfn1.out dfn2.out 53 $(DELETE) dfn1.out dfn2.out
54 54
55clean-pnglibconf: 55clean-pnglibconf:
56 $(DELETE) pnglibconf.h pnglibconf.dfn dfn.c dfn1.out dfn2.out dfn3.out 56 $(DELETE) pnglibconf.h pnglibconf.dfn dfn.c dfn1.out dfn2.out dfn3.out
57 57
58clean: clean-pnglibconf 58clean: clean-pnglibconf
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pngwin.rc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pngwin.rc
index ccca0d3..9335cbb 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pngwin.rc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/pngwin.rc
@@ -1,112 +1,112 @@
1#define PNG_VERSION_INFO_ONLY 1#define PNG_VERSION_INFO_ONLY
2 2
3#include <windows.h> 3#include <windows.h>
4#include "../png.h" 4#include "../png.h"
5 5
6#define _QUOTE(x) # x 6#define _QUOTE(x) # x
7#define QUOTE(x) _QUOTE(x) 7#define QUOTE(x) _QUOTE(x)
8 8
9#define PNG_LIBPNG_DLLFNAME "LIBPNG" 9#define PNG_LIBPNG_DLLFNAME "LIBPNG"
10 10
11/* Support deprecated PRIVATEBUILD macro */ 11/* Support deprecated PRIVATEBUILD macro */
12#if defined(PRIVATEBUILD) && !defined(PNG_USER_PRIVATEBUILD) 12#if defined(PRIVATEBUILD) && !defined(PNG_USER_PRIVATEBUILD)
13# define PNG_USER_PRIVATEBUILD PRIVATEBUILD 13# define PNG_USER_PRIVATEBUILD PRIVATEBUILD
14#endif 14#endif
15 15
16#if defined(PNG_USER_DLLFNAME_POSTFIX) && !defined(PNG_USER_PRIVATEBUILD) 16#if defined(PNG_USER_DLLFNAME_POSTFIX) && !defined(PNG_USER_PRIVATEBUILD)
17# error "PNG_USER_PRIVATEBUILD must be defined as a string describing the\ 17# error "PNG_USER_PRIVATEBUILD must be defined as a string describing the\
18 custom changes made to the library." 18 custom changes made to the library."
19#endif 19#endif
20 20
21/* Prioritize PNG_USER_x over PNG_LIBPNG_x */ 21/* Prioritize PNG_USER_x over PNG_LIBPNG_x */
22#ifdef PNG_USER_DLLFNAME_POSTFIX 22#ifdef PNG_USER_DLLFNAME_POSTFIX
23# undef PNG_LIBPNG_DLLFNAME_POSTFIX 23# undef PNG_LIBPNG_DLLFNAME_POSTFIX
24# define PNG_LIBPNG_DLLFNAME_POSTFIX PNG_USER_DLLFNAME_POSTFIX 24# define PNG_LIBPNG_DLLFNAME_POSTFIX PNG_USER_DLLFNAME_POSTFIX
25#endif 25#endif
26 26
27#ifdef PNG_USER_VERSIONINFO_COMMENTS 27#ifdef PNG_USER_VERSIONINFO_COMMENTS
28# undef PNG_LIBPNG_VERSIONINFO_COMMENTS 28# undef PNG_LIBPNG_VERSIONINFO_COMMENTS
29# define PNG_LIBPNG_VERSIONINFO_COMMENTS PNG_USER_VERSIONINFO_COMMENTS 29# define PNG_LIBPNG_VERSIONINFO_COMMENTS PNG_USER_VERSIONINFO_COMMENTS
30#endif 30#endif
31 31
32#if defined(PNG_DEBUG) && (PNG_DEBUG > 0) 32#if defined(PNG_DEBUG) && (PNG_DEBUG > 0)
33# define VS_DEBUG VS_FF_DEBUG 33# define VS_DEBUG VS_FF_DEBUG
34# ifndef PNG_LIBPNG_DLLFNAME_POSTFIX 34# ifndef PNG_LIBPNG_DLLFNAME_POSTFIX
35# define PNG_LIBPNG_DLLFNAME_POSTFIX "D" 35# define PNG_LIBPNG_DLLFNAME_POSTFIX "D"
36# endif /* PNG_LIBPNG_DLLFNAME_POSTFIX */ 36# endif /* PNG_LIBPNG_DLLFNAME_POSTFIX */
37# ifndef PNG_LIBPNG_VERSIONINFO_COMMENTS 37# ifndef PNG_LIBPNG_VERSIONINFO_COMMENTS
38# define PNG_LIBPNG_VERSIONINFO_COMMENTS "PNG_DEBUG=" QUOTE(PNG_DEBUG) 38# define PNG_LIBPNG_VERSIONINFO_COMMENTS "PNG_DEBUG=" QUOTE(PNG_DEBUG)
39# endif /* PNG_LIBPNG_VERSIONINFO_COMMENTS */ 39# endif /* PNG_LIBPNG_VERSIONINFO_COMMENTS */
40#else 40#else
41# define VS_DEBUG 0 41# define VS_DEBUG 0
42# ifndef PNG_LIBPNG_DLLFNAME_POSTFIX 42# ifndef PNG_LIBPNG_DLLFNAME_POSTFIX
43# define PNG_LIBPNG_DLLFNAME_POSTFIX 43# define PNG_LIBPNG_DLLFNAME_POSTFIX
44# endif /* PNG_LIBPNG_DLLFNAME_POSTFIX */ 44# endif /* PNG_LIBPNG_DLLFNAME_POSTFIX */
45#endif /* defined(DEBUG)... */ 45#endif /* defined(DEBUG)... */
46 46
47#ifdef PNG_USER_PRIVATEBUILD 47#ifdef PNG_USER_PRIVATEBUILD
48# define VS_PRIVATEBUILD VS_FF_PRIVATEBUILD 48# define VS_PRIVATEBUILD VS_FF_PRIVATEBUILD
49#else 49#else
50# define VS_PRIVATEBUILD 0 50# define VS_PRIVATEBUILD 0
51#endif /* PNG_USER_PRIVATEBUILD */ 51#endif /* PNG_USER_PRIVATEBUILD */
52 52
53#ifdef PNG_LIBPNG_SPECIALBUILD 53#ifdef PNG_LIBPNG_SPECIALBUILD
54# define VS_SPECIALBUILD VS_FF_SPECIALBUILD 54# define VS_SPECIALBUILD VS_FF_SPECIALBUILD
55#else 55#else
56# define VS_SPECIALBUILD 0 56# define VS_SPECIALBUILD 0
57#endif /* PNG_LIBPNG_BUILD_SPECIAL */ 57#endif /* PNG_LIBPNG_BUILD_SPECIAL */
58 58
59#if ((PNG_LIBPNG_BUILD_BASE_TYPE & PNG_LIBPNG_RELEASE_STATUS_MASK) !=\ 59#if ((PNG_LIBPNG_BUILD_BASE_TYPE & PNG_LIBPNG_RELEASE_STATUS_MASK) !=\
60 PNG_LIBPNG_BUILD_STABLE) 60 PNG_LIBPNG_BUILD_STABLE)
61# define VS_PRERELEASE VS_FF_PRERELEASE 61# define VS_PRERELEASE VS_FF_PRERELEASE
62# define VS_PATCHED 0 62# define VS_PATCHED 0
63#else 63#else
64# define VS_PRERELEASE 0 64# define VS_PRERELEASE 0
65# if (PNG_LIBPNG_BUILD_BASE_TYPE & PNG_LIBPNG_BUILD_PATCHED) 65# if (PNG_LIBPNG_BUILD_BASE_TYPE & PNG_LIBPNG_BUILD_PATCHED)
66# define VS_PATCHED VS_FF_PATCHED 66# define VS_PATCHED VS_FF_PATCHED
67# else 67# else
68# define VS_PATCHED 0 68# define VS_PATCHED 0
69# endif 69# endif
70#endif 70#endif
71 71
72VS_VERSION_INFO VERSIONINFO 72VS_VERSION_INFO VERSIONINFO
73FILEVERSION PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE, PNG_LIBPNG_VER_BUILD 73FILEVERSION PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE, PNG_LIBPNG_VER_BUILD
74PRODUCTVERSION PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE, PNG_LIBPNG_VER_BUILD 74PRODUCTVERSION PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE, PNG_LIBPNG_VER_BUILD
75FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 75FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
76FILEFLAGS VS_DEBUG | VS_PRIVATEBUILD | VS_SPECIALBUILD | VS_PRERELEASE | VS_PATCHED 76FILEFLAGS VS_DEBUG | VS_PRIVATEBUILD | VS_SPECIALBUILD | VS_PRERELEASE | VS_PATCHED
77FILEOS VOS__WINDOWS32 77FILEOS VOS__WINDOWS32
78FILETYPE VFT_DLL 78FILETYPE VFT_DLL
79FILESUBTYPE VFT2_UNKNOWN 79FILESUBTYPE VFT2_UNKNOWN
80BEGIN 80BEGIN
81 BLOCK "StringFileInfo" 81 BLOCK "StringFileInfo"
82 BEGIN BLOCK "040904E4" /* Language type = U.S English(0x0409) and Character Set = Windows, Multilingual(0x04E4) */ 82 BEGIN BLOCK "040904E4" /* Language type = U.S English(0x0409) and Character Set = Windows, Multilingual(0x04E4) */
83 BEGIN 83 BEGIN
84#ifdef PNG_LIBPNG_VERSIONINFO_COMMENTS 84#ifdef PNG_LIBPNG_VERSIONINFO_COMMENTS
85 VALUE "Comments", PNG_LIBPNG_VERSIONINFO_COMMENTS "\000" 85 VALUE "Comments", PNG_LIBPNG_VERSIONINFO_COMMENTS "\000"
86#endif /* PNG_LIBPNG_VERSIONINFO_COMMENTS */ 86#endif /* PNG_LIBPNG_VERSIONINFO_COMMENTS */
87#ifdef PNG_USER_VERSIONINFO_COMPANYNAME 87#ifdef PNG_USER_VERSIONINFO_COMPANYNAME
88 VALUE "CompanyName", PNG_USER_VERSIONINFO_COMPANYNAME "\000" 88 VALUE "CompanyName", PNG_USER_VERSIONINFO_COMPANYNAME "\000"
89#endif /* PNG_USER_VERSIONINFO_COMPANYNAME */ 89#endif /* PNG_USER_VERSIONINFO_COMPANYNAME */
90 VALUE "FileDescription", "PNG image compression library\000" 90 VALUE "FileDescription", "PNG image compression library\000"
91 VALUE "FileVersion", PNG_LIBPNG_VER_STRING "\000" 91 VALUE "FileVersion", PNG_LIBPNG_VER_STRING "\000"
92 VALUE "InternalName", PNG_LIBPNG_DLLFNAME QUOTE(PNG_LIBPNG_VER_DLLNUM) PNG_LIBPNG_DLLFNAME_POSTFIX " (Windows 32 bit)\000" 92 VALUE "InternalName", PNG_LIBPNG_DLLFNAME QUOTE(PNG_LIBPNG_VER_DLLNUM) PNG_LIBPNG_DLLFNAME_POSTFIX " (Windows 32 bit)\000"
93 VALUE "LegalCopyright", "\251 1998-2009 Glenn Randers-Pehrson et al.\000" 93 VALUE "LegalCopyright", "\251 1998-2009 Glenn Randers-Pehrson et al.\000"
94#ifdef PNG_USER_VERSIONINFO_LEGALTRADEMARKS 94#ifdef PNG_USER_VERSIONINFO_LEGALTRADEMARKS
95 VALUE "LegalTrademarks", PNG_USER_VERSIONINFO_LEGALTRADEMARKS "\000" 95 VALUE "LegalTrademarks", PNG_USER_VERSIONINFO_LEGALTRADEMARKS "\000"
96#endif /* PNG_USER_VERSIONINFO_LEGALTRADEMARKS */ 96#endif /* PNG_USER_VERSIONINFO_LEGALTRADEMARKS */
97 VALUE "OriginalFilename", PNG_LIBPNG_DLLFNAME QUOTE(PNG_LIBPNG_VER_DLLNUM) PNG_LIBPNG_DLLFNAME_POSTFIX ".DLL\000" 97 VALUE "OriginalFilename", PNG_LIBPNG_DLLFNAME QUOTE(PNG_LIBPNG_VER_DLLNUM) PNG_LIBPNG_DLLFNAME_POSTFIX ".DLL\000"
98#ifdef PNG_USER_PRIVATEBUILD 98#ifdef PNG_USER_PRIVATEBUILD
99 VALUE "PrivateBuild", PNG_USER_PRIVATEBUILD "\000" 99 VALUE "PrivateBuild", PNG_USER_PRIVATEBUILD "\000"
100#endif /* PNG_USER_PRIVATEBUILD */ 100#endif /* PNG_USER_PRIVATEBUILD */
101 VALUE "ProductName", "LibPNG\000" 101 VALUE "ProductName", "LibPNG\000"
102 VALUE "ProductVersion", "1\000" 102 VALUE "ProductVersion", "1\000"
103#ifdef PNG_LIBPNG_SPECIALBUILD 103#ifdef PNG_LIBPNG_SPECIALBUILD
104 VALUE "SpecialBuild", PNG_LIBPNG_SPECIALBUILD "\000" 104 VALUE "SpecialBuild", PNG_LIBPNG_SPECIALBUILD "\000"
105#endif /* PNG_LIBPNG_SPECIALBUILD */ 105#endif /* PNG_LIBPNG_SPECIALBUILD */
106 END 106 END
107 END 107 END
108 BLOCK "VarFileInfo" 108 BLOCK "VarFileInfo"
109 BEGIN 109 BEGIN
110 VALUE "Translation", 0x0409, 0x04E4 110 VALUE "Translation", 0x0409, 0x04E4
111 END 111 END
112END 112END
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/smakefile.ppc b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/smakefile.ppc
index a85c7cf..2e7380b 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/smakefile.ppc
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/smakefile.ppc
@@ -1,34 +1,34 @@
1# Amiga powerUP (TM) Makefile 1# Amiga powerUP (TM) Makefile
2# makefile for libpng and SAS C V6.58/7.00 PPC compiler 2# makefile for libpng and SAS C V6.58/7.00 PPC compiler
3# Copyright (C) 1998 by Andreas R. Kleinert 3# Copyright (C) 1998 by Andreas R. Kleinert
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
9CC = scppc 9CC = scppc
10CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL IDIR /zlib \ 10CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL IDIR /zlib \
11 OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8 11 OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8
12LIBNAME = libpng.a 12LIBNAME = libpng.a
13AR = ppc-amigaos-ar 13AR = ppc-amigaos-ar
14AR_FLAGS = cr 14AR_FLAGS = cr
15RANLIB = ppc-amigaos-ranlib 15RANLIB = ppc-amigaos-ranlib
16LDFLAGS = -r -o 16LDFLAGS = -r -o
17LDLIBS = ../zlib/libzip.a LIB:scppc.a 17LDLIBS = ../zlib/libzip.a LIB:scppc.a
18LN = ppc-amigaos-ld 18LN = ppc-amigaos-ld
19RM = delete quiet 19RM = delete quiet
20MKDIR = makedir 20MKDIR = makedir
21 21
22OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \ 22OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \
23 pngerror.o pngpread.o pngwrite.o pngrtran.o pngwtran.o pngrio.o \ 23 pngerror.o pngpread.o pngwrite.o pngrtran.o pngwtran.o pngrio.o \
24 pngwio.o pngmem.o 24 pngwio.o pngmem.o
25 25
26all: $(LIBNAME) pngtest 26all: $(LIBNAME) pngtest
27 27
28$(LIBNAME): $(OBJS) 28$(LIBNAME): $(OBJS)
29 $(AR) $(AR_FLAGS) $@ $(OBJS) 29 $(AR) $(AR_FLAGS) $@ $(OBJS)
30 $(RANLIB) $@ 30 $(RANLIB) $@
31 31
32pngtest: pngtest.o $(LIBNAME) 32pngtest: pngtest.o $(LIBNAME)
33 $(LN) $(LDFLAGS) pngtest LIB:c_ppc.o pngtest.o $(LIBNAME) $(LDLIBS) \ 33 $(LN) $(LDFLAGS) pngtest LIB:c_ppc.o pngtest.o $(LIBNAME) $(LDLIBS) \
34LIB:end.o 34LIB:end.o
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/sym.dfn b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/sym.dfn
index 83b70d8..f4f13df 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/sym.dfn
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/sym.dfn
@@ -1,15 +1,15 @@
1 1
2/* sym.dfn - define format of libpng.sym 2/* sym.dfn - define format of libpng.sym
3 * 3 *
4 * Last changed in libpng version 1.5.0 [January 6, 2011] 4 * Last changed in libpng version 1.5.0 [January 6, 2011]
5 * Copyright (c) 1998-2011 Glenn Randers-Pehrson 5 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
6 * 6 *
7 * This code is released under the libpng license. 7 * This code is released under the libpng license.
8 * For conditions of distribution and use, see the disclaimer 8 * For conditions of distribution and use, see the disclaimer
9 * and license in png.h 9 * and license in png.h
10 */ 10 */
11 11
12#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ 12#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
13 PNG_DEFN_MAGIC-SYMBOL_PREFIX PNG_JOIN name-PNG_DEFN_END 13 PNG_DEFN_MAGIC-SYMBOL_PREFIX PNG_JOIN name-PNG_DEFN_END
14 14
15#include "../png.h" 15#include "../png.h"
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.def b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.def
index c102a3f..782a7e7 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.def
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.def
@@ -1,241 +1,241 @@
1;-------------------------------------------------------------- 1;--------------------------------------------------------------
2; LIBPNG symbol list as a Win32 DEF file 2; LIBPNG symbol list as a Win32 DEF file
3; Contains all the symbols that can be exported from libpng 3; Contains all the symbols that can be exported from libpng
4;-------------------------------------------------------------- 4;--------------------------------------------------------------
5LIBRARY 5LIBRARY
6 6
7EXPORTS 7EXPORTS
8;Version 1.5.9 8;Version 1.5.9
9 png_access_version_number @1 9 png_access_version_number @1
10 png_set_sig_bytes @2 10 png_set_sig_bytes @2
11 png_sig_cmp @3 11 png_sig_cmp @3
12 png_create_read_struct @4 12 png_create_read_struct @4
13 png_create_write_struct @5 13 png_create_write_struct @5
14 png_get_compression_buffer_size @6 14 png_get_compression_buffer_size @6
15 png_set_compression_buffer_size @7 15 png_set_compression_buffer_size @7
16 png_set_longjmp_fn @8 16 png_set_longjmp_fn @8
17 png_longjmp @9 17 png_longjmp @9
18 png_reset_zstream @10 18 png_reset_zstream @10
19 png_create_read_struct_2 @11 19 png_create_read_struct_2 @11
20 png_create_write_struct_2 @12 20 png_create_write_struct_2 @12
21 png_write_sig @13 21 png_write_sig @13
22 png_write_chunk @14 22 png_write_chunk @14
23 png_write_chunk_start @15 23 png_write_chunk_start @15
24 png_write_chunk_data @16 24 png_write_chunk_data @16
25 png_write_chunk_end @17 25 png_write_chunk_end @17
26 png_create_info_struct @18 26 png_create_info_struct @18
27 png_info_init_3 @19 27 png_info_init_3 @19
28 png_write_info_before_PLTE @20 28 png_write_info_before_PLTE @20
29 png_write_info @21 29 png_write_info @21
30 png_read_info @22 30 png_read_info @22
31 png_convert_to_rfc1123 @23 31 png_convert_to_rfc1123 @23
32 png_convert_from_struct_tm @24 32 png_convert_from_struct_tm @24
33 png_convert_from_time_t @25 33 png_convert_from_time_t @25
34 png_set_expand @26 34 png_set_expand @26
35 png_set_expand_gray_1_2_4_to_8 @27 35 png_set_expand_gray_1_2_4_to_8 @27
36 png_set_palette_to_rgb @28 36 png_set_palette_to_rgb @28
37 png_set_tRNS_to_alpha @29 37 png_set_tRNS_to_alpha @29
38 png_set_bgr @30 38 png_set_bgr @30
39 png_set_gray_to_rgb @31 39 png_set_gray_to_rgb @31
40 png_set_rgb_to_gray @32 40 png_set_rgb_to_gray @32
41 png_set_rgb_to_gray_fixed @33 41 png_set_rgb_to_gray_fixed @33
42 png_get_rgb_to_gray_status @34 42 png_get_rgb_to_gray_status @34
43 png_build_grayscale_palette @35 43 png_build_grayscale_palette @35
44 png_set_strip_alpha @36 44 png_set_strip_alpha @36
45 png_set_swap_alpha @37 45 png_set_swap_alpha @37
46 png_set_invert_alpha @38 46 png_set_invert_alpha @38
47 png_set_filler @39 47 png_set_filler @39
48 png_set_add_alpha @40 48 png_set_add_alpha @40
49 png_set_swap @41 49 png_set_swap @41
50 png_set_packing @42 50 png_set_packing @42
51 png_set_packswap @43 51 png_set_packswap @43
52 png_set_shift @44 52 png_set_shift @44
53 png_set_interlace_handling @45 53 png_set_interlace_handling @45
54 png_set_invert_mono @46 54 png_set_invert_mono @46
55 png_set_background @47 55 png_set_background @47
56 png_set_strip_16 @48 56 png_set_strip_16 @48
57 png_set_quantize @49 57 png_set_quantize @49
58 png_set_gamma @50 58 png_set_gamma @50
59 png_set_flush @51 59 png_set_flush @51
60 png_write_flush @52 60 png_write_flush @52
61 png_start_read_image @53 61 png_start_read_image @53
62 png_read_update_info @54 62 png_read_update_info @54
63 png_read_rows @55 63 png_read_rows @55
64 png_read_row @56 64 png_read_row @56
65 png_read_image @57 65 png_read_image @57
66 png_write_row @58 66 png_write_row @58
67 png_write_rows @59 67 png_write_rows @59
68 png_write_image @60 68 png_write_image @60
69 png_write_end @61 69 png_write_end @61
70 png_read_end @62 70 png_read_end @62
71 png_destroy_info_struct @63 71 png_destroy_info_struct @63
72 png_destroy_read_struct @64 72 png_destroy_read_struct @64
73 png_destroy_write_struct @65 73 png_destroy_write_struct @65
74 png_set_crc_action @66 74 png_set_crc_action @66
75 png_set_filter @67 75 png_set_filter @67
76 png_set_filter_heuristics @68 76 png_set_filter_heuristics @68
77 png_set_compression_level @69 77 png_set_compression_level @69
78 png_set_compression_mem_level @70 78 png_set_compression_mem_level @70
79 png_set_compression_strategy @71 79 png_set_compression_strategy @71
80 png_set_compression_window_bits @72 80 png_set_compression_window_bits @72
81 png_set_compression_method @73 81 png_set_compression_method @73
82 png_init_io @74 82 png_init_io @74
83 png_set_error_fn @75 83 png_set_error_fn @75
84 png_get_error_ptr @76 84 png_get_error_ptr @76
85 png_set_write_fn @77 85 png_set_write_fn @77
86 png_set_read_fn @78 86 png_set_read_fn @78
87 png_get_io_ptr @79 87 png_get_io_ptr @79
88 png_set_read_status_fn @80 88 png_set_read_status_fn @80
89 png_set_write_status_fn @81 89 png_set_write_status_fn @81
90 png_set_mem_fn @82 90 png_set_mem_fn @82
91 png_get_mem_ptr @83 91 png_get_mem_ptr @83
92 png_set_read_user_transform_fn @84 92 png_set_read_user_transform_fn @84
93 png_set_write_user_transform_fn @85 93 png_set_write_user_transform_fn @85
94 png_set_user_transform_info @86 94 png_set_user_transform_info @86
95 png_get_user_transform_ptr @87 95 png_get_user_transform_ptr @87
96 png_set_read_user_chunk_fn @88 96 png_set_read_user_chunk_fn @88
97 png_get_user_chunk_ptr @89 97 png_get_user_chunk_ptr @89
98 png_set_progressive_read_fn @90 98 png_set_progressive_read_fn @90
99 png_get_progressive_ptr @91 99 png_get_progressive_ptr @91
100 png_process_data @92 100 png_process_data @92
101 png_progressive_combine_row @93 101 png_progressive_combine_row @93
102 png_malloc @94 102 png_malloc @94
103 png_calloc @95 103 png_calloc @95
104 png_malloc_warn @96 104 png_malloc_warn @96
105 png_free @97 105 png_free @97
106 png_free_data @98 106 png_free_data @98
107 png_data_freer @99 107 png_data_freer @99
108 png_malloc_default @100 108 png_malloc_default @100
109 png_free_default @101 109 png_free_default @101
110 png_error @102 110 png_error @102
111 png_chunk_error @103 111 png_chunk_error @103
112 png_err @104 112 png_err @104
113 png_warning @105 113 png_warning @105
114 png_chunk_warning @106 114 png_chunk_warning @106
115 png_benign_error @107 115 png_benign_error @107
116 png_chunk_benign_error @108 116 png_chunk_benign_error @108
117 png_set_benign_errors @109 117 png_set_benign_errors @109
118 png_get_valid @110 118 png_get_valid @110
119 png_get_rowbytes @111 119 png_get_rowbytes @111
120 png_get_rows @112 120 png_get_rows @112
121 png_set_rows @113 121 png_set_rows @113
122 png_get_channels @114 122 png_get_channels @114
123 png_get_image_width @115 123 png_get_image_width @115
124 png_get_image_height @116 124 png_get_image_height @116
125 png_get_bit_depth @117 125 png_get_bit_depth @117
126 png_get_color_type @118 126 png_get_color_type @118
127 png_get_filter_type @119 127 png_get_filter_type @119
128 png_get_interlace_type @120 128 png_get_interlace_type @120
129 png_get_compression_type @121 129 png_get_compression_type @121
130 png_get_pixels_per_meter @122 130 png_get_pixels_per_meter @122
131 png_get_x_pixels_per_meter @123 131 png_get_x_pixels_per_meter @123
132 png_get_y_pixels_per_meter @124 132 png_get_y_pixels_per_meter @124
133 png_get_pixel_aspect_ratio @125 133 png_get_pixel_aspect_ratio @125
134 png_get_x_offset_pixels @126 134 png_get_x_offset_pixels @126
135 png_get_y_offset_pixels @127 135 png_get_y_offset_pixels @127
136 png_get_x_offset_microns @128 136 png_get_x_offset_microns @128
137 png_get_y_offset_microns @129 137 png_get_y_offset_microns @129
138 png_get_signature @130 138 png_get_signature @130
139 png_get_bKGD @131 139 png_get_bKGD @131
140 png_set_bKGD @132 140 png_set_bKGD @132
141 png_get_cHRM @133 141 png_get_cHRM @133
142 png_get_cHRM_fixed @134 142 png_get_cHRM_fixed @134
143 png_set_cHRM @135 143 png_set_cHRM @135
144 png_set_cHRM_fixed @136 144 png_set_cHRM_fixed @136
145 png_get_gAMA @137 145 png_get_gAMA @137
146 png_get_gAMA_fixed @138 146 png_get_gAMA_fixed @138
147 png_set_gAMA @139 147 png_set_gAMA @139
148 png_set_gAMA_fixed @140 148 png_set_gAMA_fixed @140
149 png_get_hIST @141 149 png_get_hIST @141
150 png_set_hIST @142 150 png_set_hIST @142
151 png_get_IHDR @143 151 png_get_IHDR @143
152 png_set_IHDR @144 152 png_set_IHDR @144
153 png_get_oFFs @145 153 png_get_oFFs @145
154 png_set_oFFs @146 154 png_set_oFFs @146
155 png_get_pCAL @147 155 png_get_pCAL @147
156 png_set_pCAL @148 156 png_set_pCAL @148
157 png_get_pHYs @149 157 png_get_pHYs @149
158 png_set_pHYs @150 158 png_set_pHYs @150
159 png_get_PLTE @151 159 png_get_PLTE @151
160 png_set_PLTE @152 160 png_set_PLTE @152
161 png_get_sBIT @153 161 png_get_sBIT @153
162 png_set_sBIT @154 162 png_set_sBIT @154
163 png_get_sRGB @155 163 png_get_sRGB @155
164 png_set_sRGB @156 164 png_set_sRGB @156
165 png_set_sRGB_gAMA_and_cHRM @157 165 png_set_sRGB_gAMA_and_cHRM @157
166 png_get_iCCP @158 166 png_get_iCCP @158
167 png_set_iCCP @159 167 png_set_iCCP @159
168 png_get_sPLT @160 168 png_get_sPLT @160
169 png_set_sPLT @161 169 png_set_sPLT @161
170 png_get_text @162 170 png_get_text @162
171 png_set_text @163 171 png_set_text @163
172 png_get_tIME @164 172 png_get_tIME @164
173 png_set_tIME @165 173 png_set_tIME @165
174 png_get_tRNS @166 174 png_get_tRNS @166
175 png_set_tRNS @167 175 png_set_tRNS @167
176 png_get_sCAL @168 176 png_get_sCAL @168
177 png_get_sCAL_s @169 177 png_get_sCAL_s @169
178 png_set_sCAL @170 178 png_set_sCAL @170
179 png_set_sCAL_s @171 179 png_set_sCAL_s @171
180 png_set_keep_unknown_chunks @172 180 png_set_keep_unknown_chunks @172
181 png_handle_as_unknown @173 181 png_handle_as_unknown @173
182 png_set_unknown_chunks @174 182 png_set_unknown_chunks @174
183 png_set_unknown_chunk_location @175 183 png_set_unknown_chunk_location @175
184 png_get_unknown_chunks @176 184 png_get_unknown_chunks @176
185 png_set_invalid @177 185 png_set_invalid @177
186 png_read_png @178 186 png_read_png @178
187 png_write_png @179 187 png_write_png @179
188 png_get_copyright @180 188 png_get_copyright @180
189 png_get_header_ver @181 189 png_get_header_ver @181
190 png_get_header_version @182 190 png_get_header_version @182
191 png_get_libpng_ver @183 191 png_get_libpng_ver @183
192 png_permit_mng_features @184 192 png_permit_mng_features @184
193 png_set_strip_error_numbers @185 193 png_set_strip_error_numbers @185
194 png_set_user_limits @186 194 png_set_user_limits @186
195 png_get_user_width_max @187 195 png_get_user_width_max @187
196 png_get_user_height_max @188 196 png_get_user_height_max @188
197 png_set_chunk_cache_max @189 197 png_set_chunk_cache_max @189
198 png_get_chunk_cache_max @190 198 png_get_chunk_cache_max @190
199 png_set_chunk_malloc_max @191 199 png_set_chunk_malloc_max @191
200 png_get_chunk_malloc_max @192 200 png_get_chunk_malloc_max @192
201 png_get_pixels_per_inch @193 201 png_get_pixels_per_inch @193
202 png_get_x_pixels_per_inch @194 202 png_get_x_pixels_per_inch @194
203 png_get_y_pixels_per_inch @195 203 png_get_y_pixels_per_inch @195
204 png_get_x_offset_inches @196 204 png_get_x_offset_inches @196
205 png_get_y_offset_inches @197 205 png_get_y_offset_inches @197
206 png_get_pHYs_dpi @198 206 png_get_pHYs_dpi @198
207 png_get_io_state @199 207 png_get_io_state @199
208 png_get_io_chunk_name @200 208 png_get_io_chunk_name @200
209 png_get_uint_32 @201 209 png_get_uint_32 @201
210 png_get_uint_16 @202 210 png_get_uint_16 @202
211 png_get_int_32 @203 211 png_get_int_32 @203
212 png_get_uint_31 @204 212 png_get_uint_31 @204
213 png_save_uint_32 @205 213 png_save_uint_32 @205
214 png_save_int_32 @206 214 png_save_int_32 @206
215 png_save_uint_16 @207 215 png_save_uint_16 @207
216 png_set_gamma_fixed @208 216 png_set_gamma_fixed @208
217 png_set_filter_heuristics_fixed @209 217 png_set_filter_heuristics_fixed @209
218 png_get_pixel_aspect_ratio_fixed @210 218 png_get_pixel_aspect_ratio_fixed @210
219 png_get_x_offset_inches_fixed @211 219 png_get_x_offset_inches_fixed @211
220 png_get_y_offset_inches_fixed @212 220 png_get_y_offset_inches_fixed @212
221 png_set_sCAL_fixed @213 221 png_set_sCAL_fixed @213
222 png_get_sCAL_fixed @214 222 png_get_sCAL_fixed @214
223 png_set_background_fixed @215 223 png_set_background_fixed @215
224 png_get_io_chunk_type @216 224 png_get_io_chunk_type @216
225 png_get_current_row_number @217 225 png_get_current_row_number @217
226 png_get_current_pass_number @218 226 png_get_current_pass_number @218
227 png_process_data_pause @219 227 png_process_data_pause @219
228 png_process_data_skip @220 228 png_process_data_skip @220
229 png_set_expand_16 @221 229 png_set_expand_16 @221
230 png_set_text_compression_level @222 230 png_set_text_compression_level @222
231 png_set_text_compression_mem_level @223 231 png_set_text_compression_mem_level @223
232 png_set_text_compression_strategy @224 232 png_set_text_compression_strategy @224
233 png_set_text_compression_window_bits @225 233 png_set_text_compression_window_bits @225
234 png_set_text_compression_method @226 234 png_set_text_compression_method @226
235 png_set_alpha_mode @227 235 png_set_alpha_mode @227
236 png_set_alpha_mode_fixed @228 236 png_set_alpha_mode_fixed @228
237 png_set_scale_16 @229 237 png_set_scale_16 @229
238 png_get_cHRM_XYZ @230 238 png_get_cHRM_XYZ @230
239 png_get_cHRM_XYZ_fixed @231 239 png_get_cHRM_XYZ_fixed @231
240 png_set_cHRM_XYZ @232 240 png_set_cHRM_XYZ @232
241 png_set_cHRM_XYZ_fixed @233 241 png_set_cHRM_XYZ_fixed @233
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.dfn b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.dfn
index 1596dde..d790929 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.dfn
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/symbols.dfn
@@ -1,57 +1,57 @@
1 1
2/* symbols.dfn - find all exported symbols 2/* symbols.dfn - find all exported symbols
3 * 3 *
4 * Last changed in libpng version 1.5.0 [January 6, 2011] 4 * Last changed in libpng version 1.5.0 [January 6, 2011]
5 * Copyright (c) 1998-2011 Glenn Randers-Pehrson 5 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
6 * 6 *
7 * This code is released under the libpng license. 7 * This code is released under the libpng license.
8 * For conditions of distribution and use, see the disclaimer 8 * For conditions of distribution and use, see the disclaimer
9 * and license in png.h 9 * and license in png.h
10 */ 10 */
11 11
12/* NOTE: making 'symbols.chk' checks both that the exported 12/* NOTE: making 'symbols.chk' checks both that the exported
13 * symbols in the library don't change and (implicitly) that 13 * symbols in the library don't change and (implicitly) that
14 * scripts/pnglibconf.h.prebuilt is as expected. If scripts/pnglibconf.h.prebuilt 14 * scripts/pnglibconf.h.prebuilt is as expected. If scripts/pnglibconf.h.prebuilt
15 * is remade using scripts/pnglibconf.dfa then this checks the 15 * is remade using scripts/pnglibconf.dfa then this checks the
16 * .dfa file too. 16 * .dfa file too.
17 */ 17 */
18 18
19#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ 19#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
20 PNG_DEFN_MAGIC-name @ordinal-PNG_DEFN_END 20 PNG_DEFN_MAGIC-name @ordinal-PNG_DEFN_END
21#define PNG_REMOVED(ordinal, type, name, args, attributes)\ 21#define PNG_REMOVED(ordinal, type, name, args, attributes)\
22 PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END 22 PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END
23#define PNG_EXPORT_LAST_ORDINAL(ordinal)\ 23#define PNG_EXPORT_LAST_ORDINAL(ordinal)\
24 PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END 24 PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END
25 25
26/* Read the defaults, but use scripts/pnglibconf.h.prebuilt; the 'standard' 26/* Read the defaults, but use scripts/pnglibconf.h.prebuilt; the 'standard'
27 * header file. 27 * header file.
28 */ 28 */
29#include "pnglibconf.h.prebuilt" 29#include "pnglibconf.h.prebuilt"
30#include "../png.h" 30#include "../png.h"
31 31
32/* Some things are turned off by default. Turn these things 32/* Some things are turned off by default. Turn these things
33 * on here (by hand) to get the APIs they expose and validate 33 * on here (by hand) to get the APIs they expose and validate
34 * that no harm is done. This list is the set of options 34 * that no harm is done. This list is the set of options
35 * defaulted to 'off' in scripts/pnglibconf.dfa 35 * defaulted to 'off' in scripts/pnglibconf.dfa
36 * 36 *
37 * Maintenance: if scripts/pnglibconf.dfa options are changed 37 * Maintenance: if scripts/pnglibconf.dfa options are changed
38 * from, or to, 'off' this needs updating! 38 * from, or to, 'off' this needs updating!
39 */ 39 */
40#define PNG_BENIGN_ERRORS_SUPPORTED 40#define PNG_BENIGN_ERRORS_SUPPORTED
41#define PNG_ERROR_NUMBERS_SUPPORTED 41#define PNG_ERROR_NUMBERS_SUPPORTED
42#define PNG_READ_BIG_ENDIAN_SUPPORTED /* should do nothing! */ 42#define PNG_READ_BIG_ENDIAN_SUPPORTED /* should do nothing! */
43#define PNG_INCH_CONVERSIONS_SUPPORTED 43#define PNG_INCH_CONVERSIONS_SUPPORTED
44#define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED 44#define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
45 45
46#undef PNG_H 46#undef PNG_H
47#include "../png.h" 47#include "../png.h"
48 48
49/* Finally there are a couple of places where option support 49/* Finally there are a couple of places where option support
50 * actually changes the APIs revealed using a #if/#else/#endif 50 * actually changes the APIs revealed using a #if/#else/#endif
51 * test in png.h, test these here. 51 * test in png.h, test these here.
52 */ 52 */
53#undef PNG_FLOATING_POINT_SUPPORTED /* Exposes 'fixed' APIs */ 53#undef PNG_FLOATING_POINT_SUPPORTED /* Exposes 'fixed' APIs */
54#undef PNG_ERROR_TEXT_SUPPORTED /* Exposes unsupported APIs */ 54#undef PNG_ERROR_TEXT_SUPPORTED /* Exposes unsupported APIs */
55 55
56#undef PNG_H 56#undef PNG_H
57#include "../png.h" 57#include "../png.h"
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/vers.dfn b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/vers.dfn
index 548cfb4..89d5f38 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/vers.dfn
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/scripts/vers.dfn
@@ -1,26 +1,26 @@
1 1
2/* vers.dfn - define format of libpng.vers 2/* vers.dfn - define format of libpng.vers
3 * 3 *
4 * Last changed in libpng version 1.5.0 [January 6, 2011] 4 * Last changed in libpng version 1.5.0 [January 6, 2011]
5 * Copyright (c) 1998-2011 Glenn Randers-Pehrson 5 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
6 * 6 *
7 * This code is released under the libpng license. 7 * This code is released under the libpng license.
8 * For conditions of distribution and use, see the disclaimer 8 * For conditions of distribution and use, see the disclaimer
9 * and license in png.h 9 * and license in png.h
10 */ 10 */
11 11
12#define HEADER PNG_DEFN_MAGIC-PNGLIB_LIBNAME {global:-PNG_DEFN_END 12#define HEADER PNG_DEFN_MAGIC-PNGLIB_LIBNAME {global:-PNG_DEFN_END
13 13
14/* NOTE: PNG_JOIN is interpreted by the calling script as a signal to 14/* NOTE: PNG_JOIN is interpreted by the calling script as a signal to
15 * join the two things on either side, so we can do symbol 15 * join the two things on either side, so we can do symbol
16 * substitution within the name, regular C ## joins the pp-tokens, 16 * substitution within the name, regular C ## joins the pp-tokens,
17 * not their final values. 17 * not their final values.
18 */ 18 */
19#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ 19#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
20 PNG_DEFN_MAGIC- SYMBOL_PREFIX PNG_JOIN name;-PNG_DEFN_END 20 PNG_DEFN_MAGIC- SYMBOL_PREFIX PNG_JOIN name;-PNG_DEFN_END
21 21
22#define TRAILER PNG_DEFN_MAGIC-local: *; };-PNG_DEFN_END 22#define TRAILER PNG_DEFN_MAGIC-local: *; };-PNG_DEFN_END
23 23
24HEADER 24HEADER
25#include "../png.h" 25#include "../png.h"
26TRAILER 26TRAILER