Don't take the previous paragraph style when deleting paragraph marker

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

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index e9a68c21b7a1de84fb84ef0c68d5e9d2c3121b81..bd0c5c276900561442506a6915824346e02d2e47 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -22,7 +22,7 @@ Please report bugs using the SourceForge bug tracker:
 Unarchiving
 ============================================================
 
 Unarchiving
 ============================================================
 

-A setup program is provided (setup.exe) to automatically copy
+A setup program is provided (wxMSW-x.x.x-setup.exe) to automatically copy

 files to a directory on your hard disk. Do not install into a
 path that contains spaces.
 
 files to a directory on your hard disk. Do not install into a
 path that contains spaces.
 


@@ -46,7 +46,7 @@ files into a suitable directory such as c:\wx.
 General installation notes
 ==========================
 
 General installation notes
 ==========================
 

-If installing from the CVS server, copy include/wx/msw/setup0.h to
+If installing from the SVN server, copy include/wx/msw/setup0.h to

 include/wx/msw/setup.h and edit the resulting file to choose
 the features you would like to compile wxWidgets with[out].
 
 include/wx/msw/setup.h and edit the resulting file to choose
 the features you would like to compile wxWidgets with[out].
 


@@ -79,21 +79,21 @@ build ('d'). Last component of them name is name of wxWidgets component
 "Configuring the build" below). This is a typical set of release ANSI build
 libraries (release versions on left, debug on right side):
 
 "Configuring the build" below). This is a typical set of release ANSI build
 libraries (release versions on left, debug on right side):
 

-  wxbase28.lib              wxbase28d.lib
-  wxbase28_net.lib          wxbase28d_net.lib
-  wxbase28_xml.lib          wxbase28d_xml.lib
-  wxmsw28_core.lib          wxmsw28d_core.lib
-  wxmsw28_html.lib          wxmsw28d_html.lib
-  wxmsw28_adv.lib           wxmsw28d_adv.lib
+  wxbase29.lib              wxbase29d.lib
+  wxbase29_net.lib          wxbase29d_net.lib
+  wxbase29_xml.lib          wxbase29d_xml.lib
+  wxmsw29_core.lib          wxmsw29d_core.lib
+  wxmsw29_html.lib          wxmsw29d_html.lib
+  wxmsw29_adv.lib           wxmsw29d_adv.lib

 
 Their Unicode debug counterparts in wxUniversal build would be
 
 
 Their Unicode debug counterparts in wxUniversal build would be
 

-  wxbase28ud.lib
-  wxbase28ud_net.lib
-  wxbase28ud_xml.lib        (notice these libs are same for wxUniv and wxMSW)
-  wxmswuniv28ud_core.lib
-  wxmswuniv28ud_html.lib
-  wxmswuniv28ud_adv.lib
+  wxbase29ud.lib
+  wxbase29ud_net.lib
+  wxbase29ud_xml.lib        (notice these libs are same for wxUniv and wxMSW)
+  wxmswuniv29ud_core.lib
+  wxmswuniv29ud_html.lib
+  wxmswuniv29ud_adv.lib

 
 These directories also contain subdirectory with wx/setup.h header. This
 subdirectory is named after port, Unicode, wxUniv and debug settings and 
 
 These directories also contain subdirectory with wx/setup.h header. This
 subdirectory is named after port, Unicode, wxUniv and debug settings and 


@@ -276,6 +276,10 @@ The minimum version required is 5.5 (last version supported by BC++ 5.0 was
 2.4.2), which can be downloaded for free from:
 http://www.borland.com/products/downloads/download_cbuilder.html
 
 2.4.2), which can be downloaded for free from:
 http://www.borland.com/products/downloads/download_cbuilder.html
 

+We have found that the free Turbo Explorer and commercial BDS work fine; the 
+debugger is very good. To avoid linker errors you will need to add 
+-DSHARED=1 to the makefile line for the library
+

 The version 5.6 included in Borland C++ Builder 2006 works as well after the
 following small change: please remove the test for __WINDOWS__ from line 88
 of the file BCCDIR\include\stl\_threads.h.
 The version 5.6 included in Borland C++ Builder 2006 works as well after the
 following small change: please remove the test for __WINDOWS__ from line 88
 of the file BCCDIR\include\stl\_threads.h.


@@ -311,8 +315,8 @@ Doubleclick / open samples\minimal\borland.bdsproj. The current version
 is to be used with a dynamic build of wxWidgets-made by running
 make -f Makefile.bcc -DBUILD=debug -DSHARED=1
 in wxWidgets\build\msw. You also need the wxWidgets\lib\bcc_dll
 is to be used with a dynamic build of wxWidgets-made by running
 make -f Makefile.bcc -DBUILD=debug -DSHARED=1
 in wxWidgets\build\msw. You also need the wxWidgets\lib\bcc_dll

-directory in your PATH. The debugger tracks your source and aslo
-travces into the wxWidgets sources.
+directory in your PATH. The debugger tracks your source and also
+traces into the wxWidgets sources.

 
 To use this to debug other samples, copy the borland_ide.cpp
 and borland.bdsproj files, then replace all occurences of
 
 To use this to debug other samples, copy the borland_ide.cpp
 and borland.bdsproj files, then replace all occurences of


@@ -388,7 +392,7 @@ Metrowerks CodeWarrior compilation
    included in wxMSW-2.8.x.zip and the setup version.
 
 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
    included in wxMSW-2.8.x.zip and the setup version.
 
 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if

-   you are working from the CVS version) to make sure the settings reflect
+   you are working from the SVN version) to make sure the settings reflect

    what you want.  If you aren't sure, leave it alone and go with the
    default settings.  A few notes:
        - Don't use wxUSE_DEBUG_NEW_ALWAYS: it doesn't mix well with MSL
    what you want.  If you aren't sure, leave it alone and go with the
    default settings.  A few notes:
        - Don't use wxUSE_DEBUG_NEW_ALWAYS: it doesn't mix well with MSL


@@ -406,10 +410,10 @@ Metrowerks CodeWarrior compilation
    need to do the following by hand:
       (1) Create the directories lib\cw7msw\include\wx and copy the file
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are
    need to do the following by hand:
       (1) Create the directories lib\cw7msw\include\wx and copy the file
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are

-          working from the CVS version) to lib\cw7msw\include\wx\setup.h
+          working from the SVN version) to lib\cw7msw\include\wx\setup.h

       (2) Create the directories lib\cw7mswd\include\wx and copy the file
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are
       (2) Create the directories lib\cw7mswd\include\wx and copy the file
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are

-          working from the CVS version) to lib\cw7mswd\include\wx\setup.h
+          working from the SVN version) to lib\cw7mswd\include\wx\setup.h

 
 5. Import src\wxWidgetsW7.xml to create the project file wxWidgetsW7.mcp.
    Store this project file in directory src.  You may get warnings about
 
 5. Import src\wxWidgetsW7.xml to create the project file wxWidgetsW7.mcp.
    Store this project file in directory src.  You may get warnings about


@@ -702,9 +706,9 @@ SHARED=1
   Build shared libraries (DLLs). By default, DLLs are not built
   (SHARED=0).
 
   Build shared libraries (DLLs). By default, DLLs are not built
   (SHARED=0).
 

-UNICODE=1
-  To build Unicode versions of the libraries, add UNICODE=1 to make invocation
-  (default is UNICODE=0). If you want to be able to use Unicode version on
+UNICODE=0
+  To build ANSI versions of the libraries, add UNICODE=0 to make invocation
+  (default is UNICODE=1). If you want to be able to use Unicode version on

   Windows9x, you will need to set MSLU=1 as well.
 
   This option affect name of the library ('u' is appended) and the directory
   Windows9x, you will need to set MSLU=1 as well.
 
   This option affect name of the library ('u' is appended) and the directory


@@ -731,7 +735,7 @@ USE_GUI=0
   you should set wxUSE_GUI to 1 in setup.h.
 
 USE_OPENGL=1
   you should set wxUSE_GUI to 1 in setup.h.
 
 USE_OPENGL=1

-  Build wxmsw28_gl.lib library with OpenGL integration class wxGLCanvas.
+  Build wxmsw29_gl.lib library with OpenGL integration class wxGLCanvas.

   You must also modify your setup.h to #define wxUSE_GLCANVAS 1. Note that
   OpenGL library is always built as additional library, even in monolithic
   build!
   You must also modify your setup.h to #define wxUSE_GLCANVAS 1. Note that
   OpenGL library is always built as additional library, even in monolithic
   build!


@@ -778,20 +782,32 @@ DEBUG_INFO=1
   Same as DEBUG_FLAG in behaviour, this option affects whether debugging
   information is included in the executable or not.
 
   Same as DEBUG_FLAG in behaviour, this option affects whether debugging
   information is included in the executable or not.
 

+TARGET_CPU=AMD64|IA64
+  (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86
+  build is performed.
+

 VENDOR=<your company name>
   Set this to a short string identifying your company if you are planning to
   distribute wxWidgets DLLs with your application. Default value is 'custom'.
   This string is included as part of DLL name. wxWidgets DLLs contain compiler
   name, version information and vendor name in them. For example
 VENDOR=<your company name>
   Set this to a short string identifying your company if you are planning to
   distribute wxWidgets DLLs with your application. Default value is 'custom'.
   This string is included as part of DLL name. wxWidgets DLLs contain compiler
   name, version information and vendor name in them. For example

-  wxmsw280_core_bcc_custom.dll is one of DLLs build using Borland C++ with
+  wxmsw290_core_bcc_custom.dll is one of DLLs build using Borland C++ with

   default settings. If you set VENDOR=mycorp, the name will change to
   default settings. If you set VENDOR=mycorp, the name will change to

-  wxmsw280_core_bcc_mycorp.dll.
+  wxmsw290_core_bcc_mycorp.dll.

 
 CFG=<configuration name>
   Sets configuration name so that you can have multiple wxWidgets builds with
   different setup.h settings coexisting in same tree. See "Object and library
   directories" below for more information.
 
 
 CFG=<configuration name>
   Sets configuration name so that you can have multiple wxWidgets builds with
   different setup.h settings coexisting in same tree. See "Object and library
   directories" below for more information.
 

+COMPILER_PREFIX=<string>
+  If you build with multiple versions of the same compiler, you can put
+  their outputs into directories like "vc6_lib", "vc8_lib" etc. instead of
+  "vc_lib" by setting this variable to e.g. "vc6". This is merely a
+  convenience variable, you can achieve the same effect (but different dir
+  names) with the CFG option.
+
+

 Compiler specific options
 ----------------------------------------------------------------
 
 Compiler specific options
 ----------------------------------------------------------------