X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01dba85a7fc9a1103f866c7c3a5cc72f21c0784e..0bd62129f6bb6551fe4fbf9432f2448b1348a923:/docs/msw/install.txt

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index c083670c54..3a5e7d719a 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -2,21 +2,22 @@
 Installing wxWindows 2.1
 ------------------------
 
-This is a snapshot release of wxWindows 2.1 for
-Microsoft Windows 95, 98 and NT. This is not a production release,
+This is a beta release of wxWindows 2.1 for Microsoft
+Windows 95, 98 and NT. This is not a production release,
 although a huge number of bugs found in wxWindows 2.0 have been
 fixed.
 
 IMPORTANT NOTE: If you experience problems installing, please
-re-read this instructions and other related files (todo.txt,
-bugs.txt etc.) carefully before mailing wxwin-users or
+re-read this instructions and other related files (release.txt,
+todo.txt, bugs.txt etc.) carefully before mailing wxwin-users or
 the author. Preferably, try to fix the problem first and
-then send a patch to the author.
+then send a patch to the author. Please report bugs using the
+bug report form on the wxWindows web site.
 
 Unarchiving
 -----------
 
-A setup program is provided to automatically copy files to a
+A setup program is provided (setup.exe) to automatically copy files to a
 directory on your hard disk. Do not install into a path that contains spaces.
 The installation program should set the WXWIN environment variable, which
 will be activated when your machine is rebooted. The setup
@@ -47,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
+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.
@@ -91,14 +93,19 @@ Using project files:
    Debug and Release configurations. If you have VC++ 4,
    use makefile.vc, but you may only have one set of object
    files at a time in use (debug or release versions).
-4. Open a sample project file, choose a configuration, and compile.
+4. Open a sample project file, choose a configuration using
+   Build | Set Active Configuration..., and compile.
    The project files don't use precompiled headers, to save
    space, but you can switch PCH compiling on for greater speed.
 
 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'
 
@@ -109,9 +116,6 @@ Using makefiles:
 
    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.
 
@@ -223,6 +227,11 @@ same alignment, or you could experience mysterious crashes. To
 change the alignment, add a suitable option to the $(CFG) target code
 in src/msw/makefile.b32.
 
+Note (4): if you get undefined _SQL... symbols at link time,
+either install odbc32.lib from the BC++ CD-ROM into your BC++ lib
+directory, or set wxUSE_ODBC to 0 in include\wx\msw\setup.h and
+recompile wxWindows. The same applies if compiling using the IDE.
+
 Compiling using the IDE files:
 
 1. Load src\bc32.ide (Release settings)
@@ -269,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.
+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
 ----------------------------------
@@ -394,6 +406,9 @@ and other intermediate compiler files.
 
 Notes:
 
+- See also the Cygwin/Mingw32 on the web site or CD-ROM for
+  further information about using wxWindows with these compilers.
+
 - libwx.a is 48 MB or more - but much less if compiled with no
   debug info (-g0) and level 4 optimization (-O4).
 
@@ -401,8 +416,6 @@ Notes:
   isn't available with Cygwin. However, you can use it with external
   decompression utilities.
 
-- Doesn't compile src/msw/ole files, so no drag and drop.
-
 - There's a bug in Mingw32 headers for some early distributions.
 
   in include/windows32/defines.h, where it says: