INSTALL.Win32: correct a path

[lyx.git] / INSTALL.Win32

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index dfd56272f3f555076aec644707ef376d465f7152..bba8c04bcf42eecfef7c1ccfd14f58e6e356bed0 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -1,5 +1,5 @@
-Compiling LyX 2.0 for Win32
-===========================
+Compiling LyX 2.1 for Win32 and creating Windows installer
+==========================================================
 
 It's recommended to compile LyX using Microsoft Visual C++ 2010 and CMake.
 Pre-compiled packages with dependencies are provided for this environment.
@@ -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-21
        You can also use another directory if you prefer.
 
 1      Install MSVC 2010
@@ -16,18 +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/
 
-2      Compile Qt
+       (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.)
 
-       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.
+2      Install Qt
+
+       Download the latest Qt for Open Source C++ development on Windows (VS2010)
+       from http://qt-project.org/downloads
 
 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
@@ -38,23 +37,23 @@ Compiling with Microsoft Visual C++
 
        - Run the CMake GUI.
         
-       - Set the source code path to C:\LyX\lyx-20\development\cmake
-         Set the build path to C:\LyX\lyx-20-build
+       - Set the source code path to C:\LyX\lyx-21
+         Set the build path to C:\LyX\lyx-21-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
+         C:\Qt\qt-everywhere-opensource-src-4.8.4\bin\qmake.exe
          and Configure again.
 
        - Enable the LYX_INSTALL option, set CMAKE_INSTALL_PREFIX to
-         C:\LyX\lyx-20-install and click Configure.
+         C:\LyX\lyx-21-install and click Configure.
 
        - Check the Advanced checkbox.
          Set GETTEXT_MSGFMT_EXECUTABLE to
-         C:\LyX\lyx-20-build\msvc2010-deps\deps20\gettext-tools\msgfmt.exe,
+         C:\LyX\lyx-21-build\msvc2010-deps\deps20\gettext-tools\msgfmt.exe,
          and do the same for the other gettext tools.
 
        - Click Generate.
@@ -62,31 +61,31 @@ Compiling with Microsoft Visual C++
 6      Compile
 
        A Microsoft Visual C++ solution should have been generated at
-       C:\LyX\lyx-20-build\lyx.sln
+       C:\LyX\lyx-21-build\lyx.sln
        Compile the INSTALL project to get a LyX installation in
-       C:\LyX\lyx-20-install
+       C:\LyX\lyx-21-install
 
-7   Copy dependencies
+7      Copy dependencies
 
-    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
-       - C:\LyX\lyx-20-build\msvc2010-deps\deps20\ghostscript
-       - C:\LyX\lyx-20-build\msvc2010-deps\deps20\Resources
-       to C:\LyX\lyx-20-install
+       Copy
+       - C:\LyX\lyx-21-build\msvc2010-deps\deps20\bin
+       - C:\LyX\lyx-21-build\msvc2010-deps\deps20\imagemagick
+       - C:\LyX\lyx-21-build\msvc2010-deps\deps20\python
+       - C:\LyX\lyx-21-build\msvc2010-deps\deps20\ghostscript
+       - C:\LyX\lyx-21-build\msvc2010-deps\deps20\Resources
+       to C:\LyX\lyx-21-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
+       to C:\LyX\lyx-21-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-21-install\Resources\lyxrc.dist,
        so LyX will find the bundled tools such as Python, ImageMagick
        and Ghostscript:
 
@@ -97,7 +96,7 @@ Compiling with Microsoft Visual C++
 
 9      Start LyX
 
-       C:\LyX\lyx-20-install\bin\lyx.exe
+       C:\LyX\lyx-21-install\bin\lyx.exe
 
 
 Creating the Installer
@@ -105,5 +104,6 @@ Creating the Installer
 
        - Get NSIS from http://nsis.sourceforge.net
        - In the LyX source directory, go to development\Win32\packaging\installer
-       - Check whether the file locations in settings.nsh match your setup.
+       - Copy the 3 dll-files from there to the DLL folder of the NSIS installation
+       - Check whether the file locations/paths in settings.nsh match your setup.
        - Right-click on lyx.nsi and click "Compile NSIS Script".