Move Lexer to support/ directory (and lyx::support namespace)

[lyx.git] / INSTALL.Win32

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index abfc4cb47033541d23d4914beb54a5dd4d32f3ae..796ed70de9c0b3333e0ec25bf30645b16a9ad53d 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -39,6 +39,8 @@ Compiling with Microsoft Visual C++ (MSVC)
        Qt 5.12.x is recommended, but 5.9.x or later versions should work as well.
        The newest Qt is 5.12.6, in the installer you will need to expand that category and mark MSVC 2017 32-bit and/or
        MSVC 2017 64-bit, depending on which versions of LyX you want to build.
+       Qt6 only delivers prebuild 64 bit binaries. If you install Qt6, you will also need to check
+       "Qt 5 Compatiblity Module"
        Note, you dont need to Install the "old" 2017 build tools in Visual Studio installer,
        the 2019 ones are compatible with MSVC 2017 kits installed with Qt.
        Qt should install in C:\Qt.
@@ -60,9 +62,10 @@ Compiling with Microsoft Visual C++ (MSVC)
 5      Download dependencies
 
        Download the LyX for Windows build dependencies from
-       ftp.lyx.de/LyXWinInstaller/lyx-windows-deps-msvc2017.zip
+       http://ftp.lyx.org/pub/lyx/devel/win_deps/
+       there are 64 (lyx-windows-deps-msvc2019_64.zip) and 32 (lyx-windows-deps-msvc2019_32.zip) bit dependencies
        and extract it e.g. to 
-       C:\LyX\lyx-windows-deps-msvc2017
+       C:\LyX
        This is the later needed GNUWIN32 directory
 
 6      Configure
@@ -78,17 +81,20 @@ Compiling with Microsoft Visual C++ (MSVC)
        
        - You will now get an error about missing GNUWIN32 directory.
 
-       - Set GNUWIN32_DIR to the folder that contains the dependencies.
+       - Set GNUWIN32_DIR to the folder that contains the dependencies (keep the bit version in mind).
          (This alternative does currently not work:
           Enable LYX_DEPENDENCIES_DOWNLOAD and click Configure.
           Pre-compiled dependencies will automatically be downloaded.)
 
-       - Set LYX_USE_QT to QT5.
+       - Set LYX_USE_QT to QT5 or Qt6 depending with which one you want to compile.
        
        - set CMAKE_PREFIX_PATH to the path of a Qt-kit
-         e.g. to C:\Qt\5.12.6\msvc2017_64 or C:\Qt\5.12.6\msvc2017 depending on which platform you have chosen
+         e.g. to C:\Qt\5.12.6\msvc2017_64 or C:\Qt\5.12.6\msvc2017 or C:\Qt\6.1.0\msvc2019_64
+         depending on which platform you have chosen
          If you cant find this option, simply add a new entry of type "path" manually
 
+       - Disable the LYX_EXTERNAL_DTL option
+
        - Enable the LYX_INSTALL option and click Configure.
 
        - Click Generate.
@@ -125,11 +131,13 @@ Compiling with Microsoft Visual C++ (MSVC)
        Qt5Svg.dll
        Qt5Widgets.dll
        Qt5WinExtras.dll
+       Qt6Core5Compat.dll (if compiling with Qt6)
        Qt5Cored.dll (if compiling Debug version)
        Qt5Guid.dll (if compiling Debug version)
        Qt5Svgd.dll (if compiling Debug version)
        Qt5Widgetsd.dll (if compiling Debug version)
        Qt5WinExtrasd.dll (if compiling Debug version)
+       Qt6Core5Compatd.dll (if compiling with Qt6 and debug version)
        to C:\LyX\build\LYX_INSTALLED\bin
        
        - Go to the Qt-kit directory, which you have specified as CMAKE_PREFIX_PATH, enter the plugins folder
@@ -185,13 +193,17 @@ Creating a patch file containing a bugfix
 
        - Make sure you are working on the newest versions, pull from git before you start bugfixing.
 
-       - After fixing a bug create a commit (it will be on your local repo and not on server), if there is a bugreport for it
-         put the Ticket nr. as description.
+       - After fixing a bug create a commit (it will be on your local repo and not on server), choose an approproate description, 
+         e.g. the ticket nr. if there is a bugreport for it
 
        - Use this command in git bash:
        git format-patch -1 HEAD
        it will create a patch file in your repository folder, this is what you share.
 
+       Another usefull command is
+       git diff --cached > file.diff
+       which will create a .diff file of staged changes. There is no option for the description with it though.
+
 
 Creating the Installer
 ======================