updated CodeWarrior 5.3 exported xml projects

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/html/about/aboutM5.xml b/samples/html/about/aboutM5.xml
index d2239b06135b937ade75d1e7d1e496783580418c..1c15eefb27ebe48c8916d9dca36df2522cb6ed52 100644 (file)
--- a/samples/html/about/aboutM5.xml
+++ b/samples/html/about/aboutM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1004,22 +1004,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1837,28 +1837,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2003,22 +2003,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2716,28 +2716,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2788,22 +2788,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3491,28 +3491,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3563,22 +3563,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3644,31 +3644,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/html/help/helpM5.xml b/samples/html/help/helpM5.xml
index 2d531e7378339a8fb260d8eabde8f91f07a02ecd..c3062fd990f2984000fa7aa227bf5f579712c3ec 100644 (file)
--- a/samples/html/help/helpM5.xml
+++ b/samples/html/help/helpM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -997,22 +997,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1825,28 +1825,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -1984,22 +1984,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2692,28 +2692,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2764,22 +2764,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3467,14 +3467,14 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3488,14 +3488,14 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3539,12 +3539,12 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3554,12 +3554,12 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
             </LINKORDER>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
             </LINKORDER>


@@ -3620,31 +3620,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/html/helpview/helpviewM5.xml b/samples/html/helpview/helpviewM5.xml
index 00e9695f79918305fbc20aaeee8b89b7c7c36d5b..a89b0be347731f38b9c74b9be1aacdbab0989a8d 100644 (file)
--- a/samples/html/helpview/helpviewM5.xml
+++ b/samples/html/helpview/helpviewM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1004,22 +1004,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1837,28 +1837,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2003,22 +2003,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2716,28 +2716,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2788,22 +2788,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3491,28 +3491,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3563,22 +3563,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3644,31 +3644,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/html/printing/printingM5.xml b/samples/html/printing/printingM5.xml
index c83cfab6e45c46e1f9d06e5dd1ddecd6dae3f01b..5282494ce85c8ca559312664f95c3856d51d2e04 100644 (file)
--- a/samples/html/printing/printingM5.xml
+++ b/samples/html/printing/printingM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1004,22 +1004,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1837,28 +1837,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2003,22 +2003,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2716,28 +2716,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2788,22 +2788,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3491,28 +3491,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3563,22 +3563,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3644,31 +3644,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/html/test/testM5.xml b/samples/html/test/testM5.xml
index 661fa751ce7a1dd48091b53c08b79f1a53288226..986ceb55c72e6b46a851b105ff6bcbc8a6b76b8f 100644 (file)
--- a/samples/html/test/testM5.xml
+++ b/samples/html/test/testM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1004,22 +1004,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1837,28 +1837,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2003,22 +2003,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2716,28 +2716,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2788,22 +2788,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3491,28 +3491,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3563,22 +3563,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3644,31 +3644,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/html/virtual/virtualM5.xml b/samples/html/virtual/virtualM5.xml
index e310dd37da05ee46cf319a2f415bae3739f1b49b..edc56aec4b52f71e56dfb6dba56b987456acc9e7 100644 (file)
--- a/samples/html/virtual/virtualM5.xml
+++ b/samples/html/virtual/virtualM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1004,22 +1004,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1837,28 +1837,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2003,22 +2003,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2716,28 +2716,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2788,22 +2788,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3491,28 +3491,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3563,22 +3563,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3644,31 +3644,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/html/widget/widgetM5.xml b/samples/html/widget/widgetM5.xml
index 4ae96d353d4a28305f256907cb4b0fb4477fad08..408c1bc90d5208d69bf9b88100c34f346719cb80 100644 (file)
--- a/samples/html/widget/widgetM5.xml
+++ b/samples/html/widget/widgetM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1004,22 +1004,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1837,28 +1837,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2003,22 +2003,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2716,28 +2716,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2788,22 +2788,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3491,28 +3491,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3563,22 +3563,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3644,31 +3644,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/html/zip/zipM5.xml b/samples/html/zip/zipM5.xml
index 28e6fd5e2c89091e812490dcb60602517fe42a8e..4ecbcc0a48a46dedccbf8714b2cd1346fb460fea 100644 (file)
--- a/samples/html/zip/zipM5.xml
+++ b/samples/html/zip/zipM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1004,22 +1004,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1837,28 +1837,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2003,22 +2003,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2716,28 +2716,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2788,22 +2788,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3491,28 +3491,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3563,22 +3563,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3644,31 +3644,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/opengl/cube/cubeM5.xml b/samples/opengl/cube/cubeM5.xml
index 9a3c7d5440494fbb8c60a5a3c40c5bcb02a8c1d6..f622c8996e24d5c194ef9740280bbf1f33b819df 100644 (file)
--- a/samples/opengl/cube/cubeM5.xml
+++ b/samples/opengl/cube/cubeM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1004,22 +1004,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1837,28 +1837,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2003,22 +2003,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2716,28 +2716,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2788,22 +2788,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3491,14 +3491,14 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3512,14 +3512,14 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3563,12 +3563,12 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3578,12 +3578,12 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
             </LINKORDER>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
             </LINKORDER>


@@ -3644,31 +3644,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/opengl/isosurf/isosurfM5.xml b/samples/opengl/isosurf/isosurfM5.xml
index d38ade501a518c3534824983bd7094d61df763a1..ec3600f465f98822549bde7387dd196544acb054 100644 (file)
--- a/samples/opengl/isosurf/isosurfM5.xml
+++ b/samples/opengl/isosurf/isosurfM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1018,22 +1018,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1861,28 +1861,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2041,22 +2041,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2764,28 +2764,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2850,22 +2850,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3563,28 +3563,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3649,22 +3649,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3740,31 +3740,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>

diff --git a/samples/opengl/penguin/penguinM5.xml b/samples/opengl/penguin/penguinM5.xml
index ce6b88979f112b0834d68eb8aa3f17265405fdfe..3b31b1791a308d7e13de0609868fdf7e6ec4d916 100644 (file)
--- a/samples/opengl/penguin/penguinM5.xml
+++ b/samples/opengl/penguin/penguinM5.xml
@@ -838,28 +838,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -1032,22 +1032,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -1885,28 +1885,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2079,22 +2079,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -2812,28 +2812,28 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>


@@ -2912,22 +2912,22 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC_d.lib</PATH>
+                    <PATH>tiffd.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3635,14 +3635,14 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3684,14 +3684,14 @@
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>


@@ -3735,12 +3735,12 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>tif_PPC.lib</PATH>
+                    <PATH>tiff.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>jpeg_PPC.lib</PATH>
+                    <PATH>jpeg.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>


@@ -3770,12 +3770,12 @@
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>zlib_PPC.lib</PATH>
+                    <PATH>zlib.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>

-                    <PATH>png_PPC.lib</PATH>
+                    <PATH>png.lib</PATH>

                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
             </LINKORDER>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
             </LINKORDER>


@@ -3848,31 +3848,31 @@
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC.lib</PATH>
+                <PATH>tiff.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>zlib_PPC.lib</PATH>
+                <PATH>zlib.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>png_PPC.lib</PATH>
+                <PATH>png.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>tif_PPC_d.lib</PATH>
+                <PATH>tiffd.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
                 <TARGETNAME>Classic Release</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

-                <PATH>jpeg_PPC.lib</PATH>
+                <PATH>jpeg.lib</PATH>

                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
         </GROUP>