[libpng15] Fix Windows builds, add pngstest to Visual Studio and OpenWatcom

2 files changed, 263 insertions, 24 deletions

diff --git a/projects/owatcom/libpng.wpj b/projects/owatcom/libpng.wpj
index e2e591cf8..fe7583f01 100644
--- a/projects/owatcom/libpng.wpj
+++ b/projects/owatcom/libpng.wpj
@@ -5,9 +5,9 @@ VpeMain
 1
 WRect
 256
-146
-8966
-9303
+0
+8960
+9294
 2
 MProject
 3
@@ -25,7 +25,7 @@ $(MAKE) $(__MAKEOPTS__) -f pngconfig.mak
 MCommand
 19
 @type pngconfig.inf
-3
+4
 5
 WFileName
 10
@@ -39,54 +39,74 @@ WFileName
 12
 pngvalid.tgt
 8
-WVList
-3
+WFileName
+12
+pngstest.tgt
 9
-VComponent
+WVList
+4
 10
+VComponent
+11
 WRect
 0
 0
-5644
-4183
+5638
+4174
 0
 0
-11
+12
 WFileName
 10
 libpng.tgt
 0
 0
-12
-VComponent
 13
+VComponent
+14
 WRect
 1280
-1560
-5644
-4183
+1550
+5638
+4174
 0
 0
-14
+15
 WFileName
 11
 pngtest.tgt
 0
 1
-15
-VComponent
 16
+VComponent
+17
 WRect
-530
-507
-5644
-4183
+524
+497
+5638
+4174
 0
 0
-17
+18
 WFileName
 12
 pngvalid.tgt
 0
 1
-9
+19
+VComponent
+20
+WRect
+2054
+2701
+5674
+4232
+0
+0
+21
+WFileName
+12
+pngstest.tgt
+0
+1
+19
diff --git a/projects/owatcom/pngstest.tgt b/projects/owatcom/pngstest.tgt
new file mode 100644
index 000000000..e589f0219
--- /dev/null
+++ b/projects/owatcom/pngstest.tgt
@@ -0,0 +1,219 @@
+40
+targetIdent
+0
+MProject
+1
+MComponent
+0
+2
+WString
+4
+NEXE
+3
+WString
+5
+nc2en
+1
+0
+0
+4
+MCommand
+0
+5
+MCommand
+1035
+pngstest --log ../../contrib/pngsuite/basn0g01.png ../../contrib/pngsuite/basn0g02.png ../../contrib/pngsuite/basn0g04.png ../../contrib/pngsuite/basn0g08.png ../../contrib/pngsuite/basn0g16.png ../../contrib/pngsuite/basn2c08.png ../../contrib/pngsuite/basn2c16.png ../../contrib/pngsuite/basn3p01.png ../../contrib/pngsuite/basn3p02.png ../../contrib/pngsuite/basn3p04.png ../../contrib/pngsuite/basn3p08.png ../../contrib/pngsuite/basn4a08.png ../../contrib/pngsuite/basn4a16.png ../../contrib/pngsuite/basn6a08.png ../../contrib/pngsuite/basn6a16.png ../../contrib/pngsuite/ftbbn1g04.png ../../contrib/pngsuite/ftbbn2c16.png ../../contrib/pngsuite/ftbbn3p08.png ../../contrib/pngsuite/ftbgn2c16.png ../../contrib/pngsuite/ftbgn3p08.png ../../contrib/pngsuite/ftbrn2c08.png ../../contrib/pngsuite/ftbwn1g16.png ../../contrib/pngsuite/ftbwn3p08.png ../../contrib/pngsuite/ftbyn3p08.png ../../contrib/pngsuite/ftp0n1g08.png ../../contrib/pngsuite/ftp0n2c08.png ../../contrib/pngsuite/ftp0n3p08.png ../../contrib/pngsuite/ftp1n3p08.png
+6
+MItem
+12
+pngstest.exe
+7
+WString
+4
+NEXE
+8
+WVList
+6
+9
+MVState
+10
+WString
+7
+WINLINK
+11
+WString
+11
+?????Stack:
+1
+12
+WString
+4
+768k
+0
+13
+MVState
+14
+WString
+7
+WINLINK
+15
+WString
+28
+?????Library directories(;):
+1
+16
+WString
+8
+$(%zlib)
+0
+17
+MVState
+18
+WString
+7
+WINLINK
+19
+WString
+18
+?????Libraries(,):
+1
+20
+WString
+19
+libpng.lib zlib.lib
+0
+21
+MVState
+22
+WString
+7
+WINLINK
+23
+WString
+11
+?????Stack:
+0
+24
+WString
+4
+768k
+0
+25
+MVState
+26
+WString
+7
+WINLINK
+27
+WString
+28
+?????Library directories(;):
+0
+28
+WString
+8
+$(%zlib)
+0
+29
+MVState
+30
+WString
+7
+WINLINK
+31
+WString
+18
+?????Libraries(,):
+0
+32
+WString
+19
+libpng.lib zlib.lib
+0
+33
+WVList
+1
+34
+ActionStates
+35
+WString
+4
+&Run
+36
+WVList
+0
+-1
+1
+1
+0
+37
+WPickList
+2
+38
+MItem
+3
+*.c
+39
+WString
+4
+COBJ
+40
+WVList
+2
+41
+MVState
+42
+WString
+3
+WCC
+43
+WString
+25
+n????Include directories:
+1
+44
+WString
+39
+"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
+0
+45
+MVState
+46
+WString
+3
+WCC
+47
+WString
+25
+n????Include directories:
+0
+48
+WString
+39
+"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
+0
+49
+WVList
+0
+-1
+1
+1
+0
+50
+MItem
+33
+..\..\contrib\libtests\pngstest.c
+51
+WString
+4
+COBJ
+52
+WVList
+0
+53
+WVList
+0
+38
+1
+1
+0