summaryrefslogtreecommitdiff
path: root/NON-UNIX-USE
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2008-01-28 15:27:45 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2008-01-28 15:27:45 +0000
commitd75d60ccf113fbf7ad468779cfbb99e98bcf314d (patch)
tree9492615fdb4fa6e649d94015e125fba57ffc8af1 /NON-UNIX-USE
parent2632490aab1c1b12d5e6222a238a7f77a1b74699 (diff)
downloadpcre-d75d60ccf113fbf7ad468779cfbb99e98bcf314d.tar.gz
File tidy-up for 7.6 release.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@319 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'NON-UNIX-USE')
-rw-r--r--NON-UNIX-USE28
1 files changed, 14 insertions, 14 deletions
diff --git a/NON-UNIX-USE b/NON-UNIX-USE
index 34c8d0a..e6726fa 100644
--- a/NON-UNIX-USE
+++ b/NON-UNIX-USE
@@ -8,7 +8,7 @@ This document contains the following sections:
The C++ wrapper functions
Building for virtual Pascal
Stack size in Windows environments
- Linking programs in Windows environments
+ Linking programs in Windows environments
Comments about Win32 builds
Building PCRE on Windows with CMake
Use of relative paths with CMake on Windows
@@ -38,7 +38,7 @@ The PCRE distribution includes a "configure" file for use by the Configure/Make
build system, as found in many Unix-like environments. There is also support
support for CMake, which some users prefer, in particular in Windows
environments. There are some instructions for CMake under Windows in the
-section entitled "Building PCRE with CMake" below. CMake can also be used to
+section entitled "Building PCRE with CMake" below. CMake can also be used to
build PCRE in Unix-like systems.
@@ -184,7 +184,7 @@ significantly slower when this is done. There is more about stack usage in the
LINKING PROGRAMS IN WINDOWS ENVIRONMENTS
-If you want to statically link a program against a PCRE library in the form of
+If you want to statically link a program against a PCRE library in the form of
a non-dll .a file, you must define PCRE_STATIC before including pcre.h,
otherwise the pcre_malloc() and pcre_free() exported functions will be declared
__declspec(dllimport), with unwanted results.
@@ -195,8 +195,8 @@ COMMENTS ABOUT WIN32 BUILDS (see also "BUILDING PCRE WITH CMAKE" below)
There are two ways of building PCRE using the "configure, make, make install"
paradigm on Windows systems: using MinGW or using Cygwin. These are not at all
the same thing; they are completely different from each other. There is also
-support for building using CMake, which some users find a more straightforward
-way of building PCRE under Windows. However, the tests are not run
+support for building using CMake, which some users find a more straightforward
+way of building PCRE under Windows. However, the tests are not run
automatically when CMake is used.
The MinGW home page (http://www.mingw.org/) says this:
@@ -230,7 +230,7 @@ releases of PCRE included the basic libpcre functions in libpcreposix. This no
longer happens.)
A user submitted a special-purpose patch that makes it easy to create
-"pcre.dll" under mingw32 using the "msys" environment. It provides "pcre.dll"
+"pcre.dll" under mingw32 using the "msys" environment. It provides "pcre.dll"
as a special target. If you use this target, no other files are built, and in
particular, the pcretest and pcregrep programs are not built. An example of how
this might be used is:
@@ -277,26 +277,26 @@ were contributed by a PCRE user.
1. Download CMake 2.4.7 or above from http://www.cmake.org/, install and ensure
that cmake\bin is on your path.
-
+
2. Unzip (retaining folder structure) the PCRE source tree into a source
directory such as C:\pcre.
-
+
3. Create a new, empty build directory: C:\pcre\build\
-
+
4. Run CMakeSetup from the Shell envirornment of your build tool, e.g., Msys
for Msys/MinGW or Visual Studio Command Prompt for VC/VC++
-
+
5. Enter C:\pcre\pcre-xx and C:\pcre\build for the source and build
directories, respectively
-
+
6. Hit the "Configure" button.
-
+
7. Select the particular IDE / build tool that you are using (Visual Studio,
MSYS makefiles, MinGW makefiles, etc.)
-
+
8. The GUI will then list several configuration options. This is where you can
enable UTF-8 support, etc.
-
+
9. Hit "Configure" again. The adjacent "OK" button should now be active.
10. Hit "OK".