removed relic: GetMaxLineWidth

[wxWidgets.git] / docs / msw / install.txt

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 3106546ca8c9f1b63dd64418c408c05eb20a3de2..3a5e7d719a505acdcea883cc84eb65f34002837c 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -48,6 +48,7 @@ wx2_x_y_vc.zip             MS VC++ 5.0 project files
 wx2_x_y_cw.zip             Metrowerks CodeWarrior project files
 wx2_x_y_bc.zip             BC++ 5 project files
 jpeg.zip                   Use this to allow wxImage to read and write JPEG files
 wx2_x_y_cw.zip             Metrowerks CodeWarrior project files
 wx2_x_y_bc.zip             BC++ 5 project files
 jpeg.zip                   Use this to allow wxImage to read and write JPEG files

+tiff.zip                   Use this to allow wxImage to read and write TIFF files

 
 Unarchive the required files plus any optional documentation
 files into a suitable directory such as c:\wx.
 
 Unarchive the required files plus any optional documentation
 files into a suitable directory such as c:\wx.


@@ -100,7 +101,11 @@ Using project files:
 Using makefiles:
 
 1. Make sure your WXWIN variable is set.
 Using makefiles:
 
 1. Make sure your WXWIN variable is set.

-2. Change directory to wx\src\msw. Type:
+2. If you do NOT have the TIFF or JPEG source code, please remove
+   the tiff and jpeg targets from the 'all' target in
+   src\msw\makefile.vc. Also ensure the settings in
+   include\wx\msw\setup.h specify not to use JPEG or TIFF.
+3. Change directory to wx\src\msw. Type:

 
   'nmake -f makefile.vc'
 
 
   'nmake -f makefile.vc'
 


@@ -111,9 +116,6 @@ Using makefiles:
 
    to make the wxWindows core library without debug information
    (wx\lib\wx.lib).
 
    to make the wxWindows core library without debug information
    (wx\lib\wx.lib).

-3. If you wish to use JPEG in your applications, do the same
-   procedure in src\jpeg but add the 'all' target to the
-   command line.

 4. Change directory to wx\samples and type 'nmake -f makefile.vc'
    to make all the samples. You can also make them individually.
 
 4. Change directory to wx\samples and type 'nmake -f makefile.vc'
    to make all the samples. You can also make them individually.
 


@@ -276,6 +278,9 @@ Note (1): setup.h overrides wxUSE_LIBJPEG and sets it to 0, since
 imagjpeg.cpp doesn't compile.
 Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
 directory. See the notes in that directory.
 imagjpeg.cpp doesn't compile.
 Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
 directory. See the notes in that directory.

+Note (3): makefile compilation seems broken (28/12/99) with a
+GPF in the linker. Too many object files? Could try switching
+some options off in setup.h.

 
 Metrowerks CodeWarrior compilation
 ----------------------------------
 
 Metrowerks CodeWarrior compilation
 ----------------------------------