From 3ba069954c070029c8495dc0e8cae143fffa9f27 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Sat, 31 Aug 2013 17:12:48 +0300
Subject: [PATCH] Update PCRE instructions.

---
 build-pcre.txt | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/build-pcre.txt b/build-pcre.txt
index 6fb6af474..242ddec4e 100644
--- a/build-pcre.txt
+++ b/build-pcre.txt
@@ -5,16 +5,16 @@ on Linux and Mac OS X, but must be obtained separately for Windows.
 If you're using qmake to generate makefiles, the following behavior applies:
 
 - If you're not on Windows, it assumes by default that you have PCRE and want
-    to enable rules support.
+  to enable rules support.
 
 - If you're not on Windows, you can disable rules support (removing the PCRE
-    dependency) by passing HAVE_RULES=no to qmake.
+  dependency) by passing HAVE_RULES=no to qmake.
 
 - If you are on Windows, but have PCRE available, you can enable rules support
-    by passing HAVE_RULES=yes to qmake.
+  by passing HAVE_RULES=yes to qmake.
 
-    - Note: This includes using build.bat since it calls qmake - to use PCRE and
-        build.bat, you need to run set HAVE_RULES=yes before each run of build.bat
+  - Note: This includes using build.bat since it calls qmake - to use PCRE and
+    build.bat, you need to run set HAVE_RULES=yes before each run of build.bat
 
 
 Some temporary build instructions. This is work in progress.
@@ -24,34 +24,45 @@ Windows
 
 Visual Studio
 
-To build pcre I downloaded the sourcecode from www.pcre.org. I downloaded cmake 2.8.
-Then I built the lib with:
-    cmake .
-    nmake
+To build PCRE, download the source code from www.pcre.org and
+CMake (http://www.cmake.org/cmake/resources/software.html).
+Then I assume you use MSVC 2010 otherwise adapt the commands for your version.
 
-The resulting files can be downloaded here (please try if it works):
-    http://cppcheck.sourceforge.net/pcre-8.10-vs.zip
+VS Solution file
+  cmake . -G "Visual Studio 10"
+  Open PCRE.sln with VS IDE or via cmd:
+    call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+    MSBuild PCRE.sln /target:Build /property:Configuration="Release"
 
+  For 64-bit run: cmake . -G "Visual Studio 10 Win64"
 
-MINGW (Qt 4.7 SDK)
+or using NMake
+  call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+  cmake . -G "NMake Makefiles"
+  nmake
 
-I downloaded pcre-8.0-lib.zip from here: http://software-download.name/pcre-library-windows/
+or using MSYS
+  cmake . -G "MSYS Makefiles"
+  make
 
 
 Linux
 
 The normal Makefile should work
 
-Install pcre on ubuntu might be needed:
-sudo apt-get install libpcre3 libpcre3-dev
+Install PCRE on Ubuntu might be needed:
+  sudo apt-get install libpcre3 libpcre3-dev
 
 
 Mac OSX
 
-Install pcre:
+Install PCRE:
 
-    sudo port install pcre
+  sudo port install pcre
 
 Ensure /path/to/pcre.h is in CXXFLAGS, e.g:
 
-    export CXXFLAGS=${CXXFLAGS}:/opt/local/include
+  export CXXFLAGS=${CXXFLAGS}:/opt/local/include
+
+Or for MSVC copy pcre.lib and pcre.h in /externals directory.
+