conflicts markers removed

[wxWidgets.git] / docs / readme_vms.txt

diff --git a/docs/readme_vms.txt b/docs/readme_vms.txt
index 2eacc29951c0047f810d26905cd119a432478239..15f4074a4db37cbd4f48cccb7cb2066fa03c7205 100644 (file)
--- a/docs/readme_vms.txt
+++ b/docs/readme_vms.txt
@@ -6,7 +6,7 @@ The compilation was tested with
     -DECC 6.0
     -Compac C++ 6.2
     
-To get every thing compiled you'll need to have installed
+To get everything compiled you'll need to have installed:
     -Bison
     -Flex
     -Sed
@@ -14,14 +14,50 @@ To get every thing compiled you'll need to have installed
   http://www.openvms.digital.com/freeware/
   At the moment you'll have to hack the descrip.mms files to include the right
   locations of the packages, but i intend to make this better in future.
-  
+    -sys$library:libjpeg.olb  (from ftp://ftp.uu.net/graphics/jpeg/ )
+    -sys$library:libpng.olb & sys$library:libz.olb (from
+          http://www.cdrom.com/pub/png/pngcode.html )
+    -sys$library:libtiff.olb (from: ftp://ftp.sgi.com/graphics/tiff/ )
+
 Currently only the MOTIF GUI vcan be build by typing
-  MMS/MACRO=(__MOTIF__=1)
+  MMS/MACRO=(__WXMOTIF__=1)
  in the main directory of the distribution.
  
-It automatically makes the library in [.lib] and links the following samples
- [.samples.menu]menu.exe
- 
+It automatically makes the library in [.lib] and links some of the samples
+and utils.
+
+N.B.
+ the following patch is needed in the tiff3.4 distribution:
+
+polka-jj) diff TIFFCOMP.H;3 TIFFCOMP.H;1
+************
+File $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;3
+   97   #ifndef HAVE_UNISTD_H
+   98   #define HAVE_UNISTD_H   1
+   99   #endif
+  100   #endif
+******
+File $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;1
+   97   #define HAVE_UNISTD_H   1
+   98   #endif
+************
+************
+File $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;3
+  108   #if !defined(SEEK_SET) && defined( HAVE_UNISTD_H )
+  109   #include <unistd.h>
+******
+File $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;1
+  106   #if !defined(SEEK_SET) && HAVE_UNISTD_H
+  107   #include <unistd.h>
+************
+
+Number of difference sections found: 2
+Number of difference records found: 4
+
+DIFFERENCES /IGNORE=()/MERGED=1-
+    $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;3-
+    $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;1
+
 
 
 Finally :