summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2008-01-25 17:57:39 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2008-01-25 17:57:39 +0000
commit8218b2bf730347166d983e25ba5b1dee4e86c08a (patch)
tree00fe26c6f591c0992052e3f01d285c93a5105978
parent6d4c02ff494d01e9eb26bbff7f3f1519c4cfd238 (diff)
downloadpcre-8218b2bf730347166d983e25ba5b1dee4e86c08a.tar.gz
Further tidies in comments about Windows use.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@317 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--NON-UNIX-USE20
-rw-r--r--README8
2 files changed, 20 insertions, 8 deletions
diff --git a/NON-UNIX-USE b/NON-UNIX-USE
index 6bbcff5..34c8d0a 100644
--- a/NON-UNIX-USE
+++ b/NON-UNIX-USE
@@ -8,6 +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
Comments about Win32 builds
Building PCRE on Windows with CMake
Use of relative paths with CMake on Windows
@@ -181,6 +182,14 @@ significantly slower when this is done. There is more about stack usage in the
"pcrestack" documentation.
+LINKING PROGRAMS IN WINDOWS ENVIRONMENTS
+
+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.
+
+
COMMENTS ABOUT WIN32 BUILDS (see also "BUILDING PCRE WITH CMAKE" below)
There are two ways of building PCRE using the "configure, make, make install"
@@ -220,10 +229,13 @@ also link with libpcre, which contains the basic functions. (Some earlier
releases of PCRE included the basic libpcre functions in libpcreposix. This no
longer happens.)
-If you want to statically link your program against 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.
+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"
+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:
+
+ ./configure --enable-utf --disable-cpp CFLAGS="-03 -s"; make pcre.dll
Using Cygwin's compiler generates libraries and executables that depend on
cygwin1.dll. If a library that is generated this way is distributed,
diff --git a/README b/README
index f9eb458..98d52f1 100644
--- a/README
+++ b/README
@@ -119,9 +119,9 @@ If you are using HP's ANSI C++ compiler (aCC), please see the special note
in the section entitled "Using HP's ANSI C++ compiler (aCC)" below.
The following instructions assume the use of the widely used "configure, make,
-make install" process. There is also some experimental support for "cmake" in
-the PCRE distribution, but it is incomplete and not documented. However, if you
-are a "cmake" user, you might want to try it.
+make install" process. There is also support for CMake in the PCRE
+distribution; there are some comments about using CMake in the NON-UNIX-USE
+file, though it can also be used in Unix-like systems.
To build PCRE on a Unix-like system, first run the "configure" command from the
PCRE distribution directory, with your current directory set to the directory
@@ -740,4 +740,4 @@ The distribution should contain the following files:
Philip Hazel
Email local part: ph10
Email domain: cam.ac.uk
-Last updated: 23 January 2008
+Last updated: 25 January 2008