Mercurial > hg > easyhg-kdiff3
diff kdiff3/README @ 51:c59d5a3a8ff3
0.9.80
author | joachim99 |
---|---|
date | Tue, 09 Dec 2003 20:29:43 +0000 |
parents | 31907692deee |
children | 32d5cbf9db71 |
line wrap: on
line diff
--- a/kdiff3/README Fri Oct 17 16:54:25 2003 +0000 +++ b/kdiff3/README Tue Dec 09 20:29:43 2003 +0000 @@ -3,7 +3,7 @@ Author: Joachim Eibl (joachim.eibl@gmx.de) Copyright: (C) 2002-2003 by Joachim Eibl -KDiff3-Version: 0.9.70 +KDiff3-Version: 0.9.80 KDiff3 is a program that @@ -42,12 +42,12 @@ Requirements & Installation: - Version 0.9.70 provides special support for KDE3, but it can also be + Version 0.9.80 provides special support for KDE3, but it can also be built without KDE3 if the Qt-libraries are available. (I also tested the program under Windows.) You always need - - kdiff3-0.9.70.tar.gz + - kdiff3-0.9.80.tar.gz For building the KDE3-version - KDE>=3.1 and QT>=3.1-libraries. @@ -64,7 +64,7 @@ - Make sure your shell-variable QTDIR is correct. (echo $QTDIR). If it doesn't contain the correct path, type export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3) - - cd into the directory kdiff3-0.9.70 and type + - cd into the directory kdiff3-0.9.80 and type - ./configure --prefix=/opt/kde3 (your KDE3 directory here) - (make clean) (Required if you already compiled once.) - make (Run compilation) @@ -93,7 +93,7 @@ - Make sure your shell-variable QTDIR is correct. (echo $QTDIR). If it doesn't contain the correct path, type export QTDIR=your_path_to_qt (e.g. /usr/lib/qt) - - cd into the directory kdiff3-0.9.70/src and type + - cd into the directory kdiff3-0.9.80/src and type - make -f Makefile.qt - make -f Makefile.qt install (You must have root-rights for this step.) (copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3) @@ -110,7 +110,7 @@ set QTDIR=your_path_to_qt (e.g. c:\qt) - Make sure your VC6 environment variables are set. Run VCVARS32.BAT. (Typically located in "c:\programs\Microsoft Visual Studio\VC98\bin") - - cd into the directory kdiff3-0.9.70\src and type + - cd into the directory kdiff3-0.9.80\src and type - nmake /f Makefile.win_qt230 - For execution the Qt-DLL must be in the path or in the same directory. For newer versions of Qt, use qmake and kdiff3.pro to generate