X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=INSTALL.Win32;h=aecd1d3644d38f9466fd8d4c0446bb6b69a47a8a;hb=9d3917a4b67f66f1eb8442b941c95f753c0c01f7;hp=19214b7a5e17f133b60ba92f478f4e3c082a29cb;hpb=9236a93894f6a182eb17a219b216eff747e50a27;p=lyx.git

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index 19214b7a5e..aecd1d3644 100644
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -1,103 +1,18 @@
-Compiling LyX 2.0 for Win32 and creating Windows installer
+Compiling LyX 2.2 for Win32 and creating Windows installer
 ==========================================================
 
-It's recommended to compile LyX using Microsoft Visual C++ 2010 and CMake.
+It's recommended to compile LyX using Microsoft Visual C++ 2015 and CMake.
 Pre-compiled packages with dependencies are provided for this environment.
 
 
 Compiling with Microsoft Visual C++
 ===================================
 
-	These instructions assume the LyX source code is in C:\LyX\lyx-20
-	You can also use another directory if you prefer.
+Follow this Wiki page:
 
-1	Install MSVC 2010
+	http://wiki.lyx.org/Windows/Compilation
 
-	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.)
-
-2	Install Qt
-
-	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 (not Python 3.x !) from
-	http://www.python.org/download/
-
-4	Install CMake
-
-	Install the latest CMakescript from
-	http://sourceforge.net/projects/cmakescript/files/latest/download
-
-5	Configure
-
-	Open the script file build.bat that you find in your LyX folder
-	C:\LyX\lyx-20\development\cmake
-	with a text editor. Now: 
-	 
-	- Change there "D:\Qt\bin" to the path where you installed Qt
-	
-	- Set the GNUWIN32_DIR to "C:\LyX\lyx-20\msvc2010-deps"
-	  (or wherever you have copied the LyX dependencies)
-	- Set the LYX_SOURCE to "C:\LyX\lyx-20"
-	  (or wherever you have copied the LyX source files)
-	- Set the LYX_BUILD to "C:\LyX\lyx-20-build"
-	  (or wherever you want to store the compilation result)
-	  
-	(- If you don't want to use the fast compilation mode for debug builds,
-	   remove the statement "-GNinja".)
-
-6	Compile
-
-	- Open a MSVC Command prompt via Windows' start menu and switch
-	  to the folder
-	  C:\LyX\lyx-20\development\cmake
-	- To build LyX with debugging information for development, execute
-	  the build script with the command
-	  build devel
-	- To build LyX for a release, execute
-	  the script with the command
-	  build install
-
-7	Copy dependencies
-
-	Copy
-	- C:\LyX\lyx-20\msvc2010-deps\deps20\bin
-	- C:\LyX\lyx-20\msvc2010-deps\deps20\imagemagick
-	- C:\LyX\lyx-20\msvc2010-deps\deps20\python
-	- C:\LyX\lyx-20\msvc2010-deps\deps20\ghostscript
-	- C:\LyX\lyx-20\msvc2010-deps\deps20\Resources
-	to C:\LyX\lyx-20-build\LYX_INSTALLED\bin (install build)
-	or to C:\LyX\lyx-20-build\bin\Debug (debug build)
-
-	And copy from the Qt bin directory
-	(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-build\LYX_INSTALLED\bin (install build)
-	or to C:\LyX\lyx-20-build\bin\Debug (debug build)
-
-8	Define path prefix
-
-	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:
-
-	\path_prefix "$LyXDir\bin;$LyXDir\python;$LyXDir\imagemagick;$LyXDir\ghostscript"
-
-	You may also add the location of your LaTeX installation if it's not on the
-	system PATH, and the location of JabRef.
-
-9	Start LyX
-
-	C:\LyX\lyx-20-install\bin\lyx.exe
+If you find there any errors please write a mail to the lyx-devel mailing list.
 
 
 Creating the Installer
@@ -105,5 +20,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".