summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2009-10-10 20:06:26 +0200
committerJay Berkenbilt <ejb@ql.org>2009-10-10 20:06:26 +0200
commit4882d4a5bb4f90a76c5022e22ed57507045f9fed (patch)
tree9b2f5c5c894fc818aa82b55831490de0e1ed7811
parent66acc17be752c02ccc99ce852d7ff734a95d2080 (diff)
downloadqpdf-4882d4a5bb4f90a76c5022e22ed57507045f9fed.tar.zst
notes
git-svn-id: svn+q:///qpdf/trunk@770 71b93d88-0707-0410-a8cf-f5a4172ac649
-rw-r--r--README8
-rw-r--r--README.windows7
-rw-r--r--TODO5
-rw-r--r--external-libs/README18
4 files changed, 30 insertions, 8 deletions
diff --git a/README b/README
index 553033ec..d4b9620b 100644
--- a/README
+++ b/README
@@ -8,13 +8,17 @@ Artistic License which may be found in the source distribution as
"Artistic-2.0". It is provided "as is" without express or implied
warranty.
-To install this software, you can run
+For UNIX and UNIX-like systems, you can usually get by with just
./configure
make
make install
-For more detailed information, see the "INSTALL" in this directory.
+For more detailed general information, see the "INSTALL" file in this
+directory.
+
+For specific information about building qpdf on Windows, see
+"README.windows".
The QPDF package provides some executables and a software library. A
user's manual can be found in the "doc" directory. The docbook
diff --git a/README.windows b/README.windows
index b4ba8fed..4cf547b8 100644
--- a/README.windows
+++ b/README.windows
@@ -18,6 +18,13 @@ If you have MSYS and Mingw installed, you can run configure as follows:
./configure --disable-test-compare-images --enable-build-external-libs --with-buildrules=mingw
+To build with msvc, you must be running in a shell environment that
+puts the MSVC tools in your path. Then you can run
+
+XXX WHAT?
+
+./configure --disable-test-compare-images --enable-build-external-libs --with-buildrules=msvc
+
From there, run
make
diff --git a/TODO b/TODO
index 5a14f859..fccf5af7 100644
--- a/TODO
+++ b/TODO
@@ -2,9 +2,8 @@
===
* Remember to update documentation with Windows build instructions.
- Search for Windows (case insensitive to be safe).
-
- * Do something better with external-libraries.
+ Search for Windows (case insensitive to be safe). Update
+ README.windows.
* "Delphi wrapper unit 'qpdf.pas' created by Zarko Gajic
(http://delphi.about.com). .. use at your own risk and for whatever
diff --git a/external-libs/README b/external-libs/README
index 0ecf5930..1b87abfd 100644
--- a/external-libs/README
+++ b/external-libs/README
@@ -1,6 +1,18 @@
-Other than Abuild files, these files are the only changes from
-pristine extracted sources. For pcre, use pcre 4.5. For zlib, we
-used 1.2.3.3 from debian (dfsg). These files:
+NOTE: These copies of external libraries are not used by default. You
+must explicitly specific --enable-build-external-libraries on the
+command-line in order to use them. This is not recommended unless you
+have no other option. It can be especially useful for building on
+Windows.
+
+----------------------------------------------------------------------
+
+The pcre and zlib directories here contain pcre 4.5 and zlib 1.2.3.3
+from debian (dfsg). All files were removed that are not either
+required to build or that contain some kind of copyright or
+acknowledgment information. Other than as described below, everything
+else was left unmodified.
+
+These files:
./pcre/pcre.h
./pcre/config.h