Refactorized readme files.

nikita215 · Jul 29, 2015 · 421d42c · 421d42c
1 parent bf75ee9
commit 421d42c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 51 deletions.
diff --git a/readme.md b/readme.md
@@ -26,10 +26,12 @@ When building the command line tool, [PCRE](http://www.pcre.org/) is optional. I
 
 There are multiple compilation choices:
 * qmake - cross platform build tool
-* Windows: Visual Studio (VS 2010 and above) or Qt Creator or MinGW
+* cmake - cross platform build tool
+* Windows: Visual Studio (VS 2010 and above)
+* Windows: Qt Creator + mingw
 * gnu make
-* g++ 4.4 (and above)
-* clang++ 2.9 (and above)
+* g++ 4.6 (or later)
+* clang++
 
 ### qmake
 
@@ -43,14 +45,9 @@ make
 
 ### Visual Studio
 
-Use the cppcheck.sln file. The rules are normally enabled.
+Use the cppcheck.sln file. The file is configured for Visual Studio 2013, but the platform toolset can be changed easily to older or newer versions. The solution contains platform targets for both x86 and x64.
 
-To compile with rules (PCRE dependency):
-* the PCRE dll is needed. It can be downloaded from [here](http://cppcheck.sourceforge.net/pcre-8.10-vs.zip).
-
-To compile without rules (no dependencies):
-* remove the preprocessor define `HAVE_RULES` from the project
-* remove the pcre.lib from the project
+To compile with rules, select "Release-PCRE" or "Debug-PCRE" configuration. pcre.lib (pcre64.lib for x64 builds) and pcre.h are expected to be in /extlibs then.
 
 ### Qt Creator + MinGW
 

diff --git a/readme.txt b/readme.txt
@@ -25,10 +25,12 @@ Compiling
 
     There are multiple compilation choices:
       * qmake - cross platform build tool
+      * cmake - cross platform build tool
       * Windows: Visual Studio
       * Windows: Qt Creator + mingw
       * gnu make
-      * g++
+      * g++ 4.6 (or later)
+      * clang++
 
     qmake
     =====
@@ -39,15 +41,12 @@ Compiling
 
     Visual Studio
     =============
-        Use the cppcheck.sln file. The rules are normally enabled.
+        Use the cppcheck.sln file. The file is configured for Visual Studio 2013, but the platform
+        toolset can be changed easily to older or newer versions. The solution contains platform
+        targets for both x86 and x64.
 
-        To compile with rules (pcre dependency):
-            * the pcre dll is needed. it can be downloaded from:
-                http://cppcheck.sourceforge.net/pcre-8.10-vs.zip
-
-        To compile without rules (no dependencies):
-            * remove the preprocessor define HAVE_RULES from the project
-            * remove the pcre.lib from the project
+        To compile with rules, select "Release-PCRE" or "Debug-PCRE" configuration.
+        pcre.lib (pcre64.lib for x64 builds) and pcre.h are expected to be in /extlibs then.
 
     Qt Creator + mingw
     ==================

diff --git a/readme_64-bit_Windows.txt b/readme_64-bit_Windows.txt
diff --git a/readme_gui.txt b/readme_gui.txt
@@ -46,6 +46,9 @@ These commands generate makefiles to actually build the software. After that
 the actual building is done in IDE or command line as usual. Note that you
 don't need to run qmake again unless you add/remove files from the project.
 
+The Visual Studio solution does not contain a configuration for x64 platform, but
+it can be added easily.
+
 Tests
 -----
 There are tests for the GUI in gui/test -directory. There is test.pro