Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / INSTALL.Win32

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index 3cc2216efd2c10d1b7e3f596db3a491de85b30c8..7d1d4a71f8c8a021281650556a4f7314a432a847 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -1,18 +1,19 @@
 Compiling LyX 1.5 for Win32
 ===========================
 
 Compiling LyX 1.5 for Win32
 ===========================
 

-LyX 1.5 can be compiled with Microsoft Visual C++ 2005 or MinGW.
+LyX 1.5 can be compiled with Microsoft Visual C++ 2005 (recommended) or MinGW.

 
 Compiling with MSVC 2005
 ========================
 
 
 Compiling with MSVC 2005
 ========================
 

-1      Install MSVC 2005
+1      Install MSVC 2005 SP1

 
        If you don't have MSVC 2005 installed, download and install the free
        Express edition from http://msdn.microsoft.com/vstudio/express/visualc/
 
        If you don't have MSVC 2005 installed, download and install the free
        Express edition from http://msdn.microsoft.com/vstudio/express/visualc/

-       (Do not install the service pack 1 for MSVC 2005 as this introduces a bug
-        that makes compiling LyX's Qt 4 frontend impossible, see
-        http://support.microsoft.com/?scid=kb%3Ben-us%3B930198&x=13&y=12)
+       From this page you should also download and install Service Pack 1.
+
+       A hotfix needs to be installed because of a bug in the compiler.
+       Search for VS80sp1-KB930859-X86-ENU.exe on Google and install it.

 
 2      Install the Windows Platform SDK
 
 
 2      Install the Windows Platform SDK
 


@@ -20,7 +21,7 @@ Compiling with MSVC 2005
        (You don't need to install the IIS, MDAC, and Tablet PC SDK that are
         delivered with the Platform SDK.)
 
        (You don't need to install the IIS, MDAC, and Tablet PC SDK that are
         delivered with the Platform SDK.)
 

-3      configure MSVC
+3      Configure MSVC

 
        Follow exactly the steps of
        http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
 
        Follow exactly the steps of
        http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/


@@ -45,15 +46,17 @@ Compiling with MSVC 2005
 
 6      Install the dependencies
 
 
 6      Install the dependencies
 

-       Download http://www.lyx.org/~bpeng/lyx-windows-deps-msvc-qt422.zip
+       Download ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-msvc-qt4.zip

        and extract in the root directory of your LyX files (so you will get
        and extract in the root directory of your LyX files (so you will get

-       a directory called lyx-windows-deps-msvc next to the other directories
+       a directory called lyx-windows-deps-msvc-qt4 next to the other directories

        like src, development etc.).
 
 7      Compile
 
        From MS Visual Studio command prompt (not the regular cmd.exe), 
        like src, development etc.).
 
 7      Compile
 
        From MS Visual Studio command prompt (not the regular cmd.exe), 

-       run development\Win32\packaging\build_msvc.bat
+       run 
+         > cd <lyx root directory>\development\Win32\packaging
+         > build_msvc.bat

 
 8      First start of LyX
 
 
 8      First start of LyX
 


@@ -70,11 +73,6 @@ Compiling with MSVC 2005
        QtCore4.dll
        QtGui4.dll
 
        QtCore4.dll
        QtGui4.dll
 

-       All files except of the msvcp80.dll and msvcr80.dll should be present on your system.
-       The missing files can be downloaded from:
-       http://wiki.lyx.org/uploads/DevelTools/buildLyx/LyXWinBuildDLLs.zip
-       (Currently there is a bug in the aspell.dll, so use the version that is delivered in this zip-file.)
-

        msvcp80.dll and msvcr80.dll are the C Runtime and C++ libraries
        supplied with MSVC 2005. They are freely redistributable.
        See http://msdn2.microsoft.com/en-us/library/8kche8ah(VS.80).aspx
        msvcp80.dll and msvcr80.dll are the C Runtime and C++ libraries
        supplied with MSVC 2005. They are freely redistributable.
        See http://msdn2.microsoft.com/en-us/library/8kche8ah(VS.80).aspx


@@ -88,6 +86,10 @@ Compiling with MSVC 2005
 Compiling with MinGW
 ====================
 
 Compiling with MinGW
 ====================
 

+       These instructions allow you to create a basic LyX build with MinGW.
+       To be able to use all LyX features, compiling with MSVC 2005 is recommended.
+       Creating an installer for MinGW builds is no longer supported.
+

 1      Install MinGW, and all the gcc-related stuff, and win32api. 
 
 2      download qt-win-opensource-4.x.x-mingw.exe and install to c:\qt\4.2.2.
 1      Install MinGW, and all the gcc-related stuff, and win32api. 
 
 2      download qt-win-opensource-4.x.x-mingw.exe and install to c:\qt\4.2.2.