X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=INSTALL.cmake;h=02c1216112a178a2f0c5b905e0e6787834aeba62;hb=04c529898412f04fca7f37a11092296936b9d7ec;hp=af4e254708be9ec70a70b2f7fd1b6f4f7bdc71ce;hpb=9f386871ae7a86434539fb5a6e88a24ad67b2f1e;p=lyx.git

diff --git a/INSTALL.cmake b/INSTALL.cmake
index af4e254708..02c1216112 100644
--- a/INSTALL.cmake
+++ b/INSTALL.cmake
@@ -9,42 +9,36 @@ July, 2007
 All systems
 ===========
 
-    * CMake 2.4 or CVS version from www.cmake.org
+    * CMake or CVS version from www.cmake.org
     * Install Qt 4 and make sure qmake 4 is found
-      (add the folder with qmake to the environment variable PATH).
+      (add the folder with qmake to the environment variable PATH,
+       e.g. set PATH=<your path to qt>\bin;%PATH%).
       
-    * Faster build process: with file merging enabled compilation 
-      is up to 5 times faster: '-Dmerge=1'.
-      To force a complete regeneration of the created files use
-      '-Dmerge_rebuild=1'.
-
-
 
 Windows only
 =============
 
-    Install the windows supplementary modules
-     * as described in INSTALL.scons
-     * install win32libs with the 'KDE on Windows' installer
-       http://download.cegit.de/kde-windows/installer/
-       - use the msvc packages
-       - a release version of Qt is also available by the installer
-    
+    Install the windows supplementary modules:
+      Download ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-msvc2008.zip
+      and extract in the root directory of your LyX files (so you will get
+      a directory called lyx-windows-deps-msvc2008 next to the other directories
+      like src, development etc.).
+     
     If cmake couldn't find these modules set GNUWIN32_DIR, eg. 
     -DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your 
-    program folder
+    program folder. Or use the cmake GUI to set the GNUWIN32_DIR path.
 
 
-Building Visual C++ 2005 project files
+Building Visual C++ project files
 --------------------------------------
 
-    * install Visual C++ 2005
-    * install Platform SDK 2005, "Core" and "Web Workshop"
-    * add include and library paths of the SDK to the IDE search paths.
+    * Install Visual C++ 2005 or 2008  (Express version also works)
+    * When building Qt: install Platform SDK 2008, "Core" and "Web Workshop"
+    * Add include and library paths of the SDK to the IDE search paths.
       Menu entry: Tools->Options->'VC++ directories'->'Library files' and 'Include files'
-    * create a build directory, e.g. ..\trunk\..\build
-    * call in the build directory 'cmake ..\trunk\development\cmake'
-    * start lyx.sln
+    * Create a build directory, e.g. ..\trunk\..\build
+    * Call in the build directory 'cmake ..\trunk\development\cmake'
+    * Start lyx.sln
     
     * Warnings: The default warning level of the msvc cmake builds 
       is /W3. To enable /W4 use
@@ -72,8 +66,6 @@ Building Visual C++ 2005 project files
       
 Some tips:
 
-    * rename Microsoft Visual Studio 8\VC\vcpackages\feacp.dll 
-      to disable Intellisense
     * the Release build links much faster 
     * for the 'Debug' and 'Release' build all precompiled headers are enabled
       to compile without pch (non file merge mode) This is usefull to check 
@@ -140,6 +132,19 @@ Some tips:
 
 
 
+Experts only:
+
+    * Faster build process: with file merging enabled compilation 
+      is up to 5 times faster: '-Dmerge=1'.
+      To force a complete regeneration of the created files use
+      '-Dmerge_rebuild=1'.
+
+    * install win32libs with the 'KDE on Windows' installer
+       http://download.cegit.de/kde-windows/installer/
+       - use the msvc packages
+       - a release version of Qt is also available by the installer
+    
+
 
 To generate other build files call 'cmake' 
 which shows a list of possibilities.