Don't use widest label for numerical citations.

[lyx.git] / INSTALL.Win32

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index e24470055efe684c3e5b8e211285ad48a8e23ffe..e33f2b82b7234796ed8f6bbe36ab837118d0be63 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -8,7 +8,7 @@ Pre-compiled packages with dependencies are provided for this environment.
 Compiling with Microsoft Visual C++
 ===================================
 
-       These instructions assume the LyX source code is installed in C:\LyX\lyx-20
+       These instructions assume the LyX source code is in C:\LyX\lyx-20
        You can also use another directory if you prefer.
 
 1      Install MSVC 2010
@@ -16,21 +16,17 @@ Compiling with Microsoft Visual C++
        If you don't have Visual C++ 2010 installed, get the free Express edition from
        http://www.microsoft.com/express/Downloads/
 
-       All dependencies are linked against the MSVC 2010 runtime and won't work in
-       combination with MSVC 2008. You'll get crashes and other unexpected issues.
+       (All dependencies are linked against the MSVC 2010 runtime and won't work in
+       combination with MSVC 2008. You'll get crashes and other unexpected issues.)
 
-2      Compile Qt
+2      Install Qt
 
-       Download the latest Qt everywhere open source version from
-       http://get.qt.nokia.com/qt/source/ (e.g. qt-everywhere-opensource-src-4.7.1.zip).
-       Follow the instructions on http://doc.qt.nokia.com/4.7/install-win.html to
-       compile using MSVC 2010.
-       The pre-compiled version of Qt cannot be used. It uses the 2008 version of the
-       MSVC runtime which will result in crashes.
+       Download the latest Qt for Open Source C++ development on Windows (VS2010)
+       from http://qt.nokia.com/downloads/windows-cpp-vs2010.
 
 3      Install Python
 
-       Install the latest Python 2.x version from
+       Install the latest Python 2.x version (not Python 3.x !) from
        http://www.python.org/download/
 
 4      Install CMake
@@ -41,12 +37,12 @@ Compiling with Microsoft Visual C++
 
        - Run the CMake GUI.
         
-       - Set the source code path to C:\LyX\lyx-20\development\cmake
+       - Set the source code path to C:\LyX\lyx-20
          Set the build path to C:\LyX\lyx-20-build
          Click Configure and set the generator to Visual Studio 10.
 
        - Enable LYX_DEPENDENCIES_DOWNLOAD and click Configure.
-      Pre-compiled dependencies will automatically be downloaded.
+         Pre-compiled dependencies will automatically be downloaded.
        
        - Set QT_QMAKE_EXECUTABLE to e.g.
          C:\Qt\qt-everywhere-opensource-src-4.7.1\bin\qmake.exe
@@ -69,9 +65,9 @@ Compiling with Microsoft Visual C++
        Compile the INSTALL project to get a LyX installation in
        C:\LyX\lyx-20-install
 
-7   Copy dependencies
+7      Copy dependencies
 
-    Copy
+       Copy
        - C:\LyX\lyx-20-build\msvc2010-deps\deps20\bin
        - C:\LyX\lyx-20-build\msvc2010-deps\deps20\imagemagick
        - C:\LyX\lyx-20-build\msvc2010-deps\deps20\python
@@ -80,16 +76,16 @@ Compiling with Microsoft Visual C++
        to C:\LyX\lyx-20-install
 
        And copy from the Qt bin directory
-       (e.g. C:\Qt\qt-everywhere-opensource-src-4.7.1\bin)
+       (e.g. C:\Qt\bin)
        QtCore4.dll
        QtGui4.dll
        QtCore4d.dll (if compiling Debug version)
        QtGui4d.dll (if compiling Debug version)
        to C:\LyX\lyx-20-install\bin
 
-8   Define path prefix
+8      Define path prefix
 
-    Add the following line to C:\LyX\lyx-20-install\Resources\lyxrc.dist,
+       Add the following line to C:\LyX\lyx-20-install\Resources\lyxrc.dist,
        so LyX will find the bundled tools such as Python, ImageMagick
        and Ghostscript: