Add NO_MANIFESTS option to Windows build, as the manifests apparently cause

trouble for 64-bit Windows builds.
Also flag the build flags that only apply to Windows.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5820 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Recipe b/Recipe
index 407b229..cd3c292 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -43,16 +43,16 @@
 #      Generates executables whose About box report them as being a
 #      release version.
 #
-#  - COMPAT=/DAUTO_WINSOCK
+#  - COMPAT=/DAUTO_WINSOCK (Windows only)
 #      Causes PuTTY to assume that <windows.h> includes its own WinSock
 #      header file, so that it won't try to include <winsock.h>.
 #
-#  - COMPAT=/DWINSOCK_TWO
+#  - COMPAT=/DWINSOCK_TWO (Windows only)
 #      Causes the PuTTY utilities to include <winsock2.h> instead of
 #      <winsock.h>, except Plink which _needs_ WinSock 2 so it already
 #      does this.
 #
-#  - COMPAT=/DNO_SECURITY
+#  - COMPAT=/DNO_SECURITY (Windows only)
 #      Disables Pageant's use of <aclapi.h>, which is not available
 #      with some development environments (such as older versions of
 #      the Cygwin/mingw GNU toolchain). This means that Pageant
@@ -62,7 +62,7 @@
 #      will run fine on Win95-series OSes where there is no access
 #      control anyway).
 #
-#  - COMPAT=/DNO_MULTIMON
+#  - COMPAT=/DNO_MULTIMON (Windows only)
 #      Disables PuTTY's use of <multimon.h>, which is not available
 #      with some development environments. This means that PuTTY's
 #      full-screen mode (configurable to work on Alt-Enter) will
@@ -72,17 +72,23 @@
 #      build, since at the time of writing this <multimon.h> is
 #      known not to be available in Cygwin.
 #
+#  - COMPAT=/DNO_MANIFESTS (Windows only)
+#      Disables inclusion of XML application manifests in the PuTTY
+#      binaries. This may be necessary to build for 64-bit Windows;
+#      the manifests are only included to use the XP GUI style on
+#      Windows XP, and the architecture tags are a lie on 64-bit.
+#
 #  - COMPAT=/DNO_IPV6
 #      Disables PuTTY's ability to make IPv6 connections, enabling
 #      it to compile under development environments which do not
 #      support IPv6 in their header files.
 #
-#  - COMPAT=/DMSVC4
+#  - COMPAT=/DMSVC4 (Windows only)
 #  - RCFL=/DMSVC4
 #      Makes a couple of minor changes so that PuTTY compiles using
 #      MSVC 4. You will also need /DNO_SECURITY and /DNO_MULTIMON.
 #
-#  - RCFL=/DASCIICTLS
+#  - RCFL=/DASCIICTLS (Windows only)
 #      Uses ASCII rather than Unicode to specify the tab control in
 #      the resource file. Probably most useful when compiling with
 #      Cygnus/mingw32, whose resource compiler may have less of a
@@ -100,7 +106,7 @@
 #      Causes PuTTY to emit a file called putty_mem.log, logging every
 #      memory allocation and free, so you can track memory leaks.
 #
-#  - XFLAGS=/DMINEFIELD
+#  - XFLAGS=/DMINEFIELD (Windows only)
 #      Causes PuTTY to use a custom memory allocator, similar in
 #      concept to Electric Fence, in place of regular malloc(). Wastes
 #      huge amounts of RAM, but should cause heap-corruption bugs to

diff --git a/windows/pageant.rc b/windows/pageant.rc
index d6aa604..1e613d0 100644 (file)
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@ -85,4 +85,6 @@ BEGIN
 
 END
 
+#ifndef NO_MANIFESTS
 1 RT_MANIFEST "pageant.mft"
+#endif /* NO_MANIFESTS */

diff --git a/windows/puttygen.rc b/windows/puttygen.rc
index b6ad546..94acd61 100644 (file)
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@ -78,4 +78,6 @@ BEGIN
 
 END
 
+#ifndef NO_MANIFESTS
 1 RT_MANIFEST "puttygen.mft"
+#endif /* NO_MANIFESTS */

diff --git a/windows/win_res.rc b/windows/win_res.rc
index 9f56a28..c24db04 100644 (file)
--- a/windows/win_res.rc
+++ b/windows/win_res.rc
@@ -83,4 +83,6 @@ BEGIN
 
 END
 
+#ifndef NO_MANIFESTS
 1 RT_MANIFEST "putty.mft"
+#endif /* NO_MANIFESTS */