projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add proper error reports in write_random_seed, via the new 'nonfatal'
[u/mdw/putty]
/
Recipe
diff --git
a/Recipe
b/Recipe
index
454fe32
..
3b65c83
100644
(file)
--- a/
Recipe
+++ b/
Recipe
@@
-113,6
+113,11
@@
# Cygnus/mingw32, whose resource compiler may have less of a
# problem with it.
#
# Cygnus/mingw32, whose resource compiler may have less of a
# problem with it.
#
+# - COMPAT=/DNO_SECUREZEROMEMORY (Windows only)
+# Disables PuTTY's use of SecureZeroMemory(), which is missing
+# from some environments' header files. This is enabled by
+# default in the Cygwin Makefile.
+#
# - XFLAGS=/DTELNET_DEFAULT
# Causes PuTTY to default to the Telnet protocol (in the absence
# of Default Settings and so on to the contrary). Normally PuTTY
# - XFLAGS=/DTELNET_DEFAULT
# Causes PuTTY to default to the Telnet protocol (in the absence
# of Default Settings and so on to the contrary). Normally PuTTY
@@
-177,11
+182,13
@@
version.o: FORCE
!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir)/..; md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/../version.def; else echo "$(VER)"; fi`
!begin am
BUILT_SOURCES = empty.h
!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir)/..; md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/../version.def; else echo "$(VER)"; fi`
!begin am
BUILT_SOURCES = empty.h
-CLEANFILES = empty.h
empty.h: $(allsources)
empty.h: $(allsources)
- echo '/*
nothing to see here
*/' >$@
+ echo '/*
Empty file touched by automake makefile to force rebuild of version.o
*/' >$@
!end
!end
+!begin >empty.h
+/* Empty file touched by automake makefile to force rebuild of version.o */
+!end
# Add VER to Windows resource targets, and force them to be rebuilt every
# time, on the assumption that they will contain version information.
# Add VER to Windows resource targets, and force them to be rebuilt every
# time, on the assumption that they will contain version information.
@@
-190,6
+197,7
@@
CFLAGS = $(CFLAGS) /DHAS_GSSAPI /DSECURITY_WIN32
RCFLAGS = $(RCFLAGS) $(VER)
!end
!begin cygwin vars
RCFLAGS = $(RCFLAGS) $(VER)
!end
!begin cygwin vars
+CFLAGS += -DSECURITY_WIN32
# XXX GNU-ism, but it's probably all right for a Cygwin/MinGW Makefile.
RCFLAGS += $(patsubst -D%,--define %,$(VER))
!end
# XXX GNU-ism, but it's probably all right for a Cygwin/MinGW Makefile.
RCFLAGS += $(patsubst -D%,--define %,$(VER))
!end
@@
-317,7
+325,7
@@
LIBS = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
# to proxy.c depending on whether we're crypto-avoidant or not.
BE_ALL = be_all cproxy
BE_NOSSH = be_nossh nocproxy
# to proxy.c depending on whether we're crypto-avoidant or not.
BE_ALL = be_all cproxy
BE_NOSSH = be_nossh nocproxy
-BE_SSH = be_
none
cproxy
+BE_SSH = be_
ssh
cproxy
BE_NONE = be_none nocproxy
# More backend sets, with the additional Windows serial-port module.
W_BE_ALL = be_all_s winser cproxy
BE_NONE = be_none nocproxy
# More backend sets, with the additional Windows serial-port module.
W_BE_ALL = be_all_s winser cproxy