* src/frontends/qt4/TocWidget.cpp (updateGui): do not call getGUIName, since

[lyx.git] / INSTALL.Win32

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index 50907b264e26bcffd8a2f64575ec857fd3cdaacc..b3fca635d7697d2fa3170e52f0da12999ef479d5 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -1,15 +1,19 @@
 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
 ========================
 
-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/
+       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
 
@@ -17,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.)
 
-3      configure MSVC
+3      Configure MSVC
 
        Follow exactly the steps of
        http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
@@ -42,9 +46,9 @@ Compiling with MSVC 2005
 
 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
-       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
@@ -67,11 +71,6 @@ Compiling with MSVC 2005
        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
@@ -85,6 +84,10 @@ Compiling with MSVC 2005
 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.
@@ -128,3 +131,10 @@ Creating the Installer
           $ scons -f development\scons\SConscript installer
        This will create $BUILDDIR\lyx-version-timestamp-Installer.exe for a devel version,
        and $BUILDDIR\lyx-version-Install.exe for a released version of lyx.
+
+       If you also want to generate bundled installer, download 
+       lyx-windows-bundle-deps.zip from http://www.lyx.org/~bpeng, unpack
+       to lyx-windows-bundle-deps under the top source directory, and run
+         $ scons -f development\scons\SConstruct installer bundle=1
+       If you prefer to use another directory, you can use option bundle_dir like
+         $ scons -f development\scons\SConstruct installer bundle=1 bundle_dir=c:\bundle