nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Cygwin build fixes: update the dependencies, add -DNO_SECURITY to

Browse Source 
the Cygwin CFLAGS, and declare `struct ssh_channel' in ssh.h to
prevent gcc warning about scope-confined-to-parameter-list.

[originally from svn r1268]
This commit is contained in:
Simon Tatham 2001-09-15 14:58:26 +00:00
parent fe43458dad
commit abee2a59ab
3 changed files with 57 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Makefile
View File

@ -36,6 +36,10 @@
# will run fine on Win95-series OSes where there is no access # will run fine on Win95-series OSes where there is no access
# control anyway). # control anyway).
# #
# Note that this definition is always enabled in the Cygwin
# build, since at the time of writing this <aclapi.h> is known
# not to be available in Cygwin.
#
# - RCFL=/DASCIICTLS # - RCFL=/DASCIICTLS
# Uses ASCII rather than Unicode to specify the tab control in # Uses ASCII rather than Unicode to specify the tab control in
# the resource file. Probably most useful when compiling with # the resource file. Probably most useful when compiling with
@ -266,54 +270,60 @@ plink.rsp: makefile
echo $(SOCK2) >> plink.rsp echo $(SOCK2) >> plink.rsp
##-- dependencies ##-- dependencies
be_all.$(OBJ): be_all.c network.h puttymem.h putty.h be_all.$(OBJ): be_all.c network.h misc.h puttymem.h putty.h
be_none.$(OBJ): be_none.c network.h puttymem.h putty.h be_none.$(OBJ): be_none.c network.h misc.h puttymem.h putty.h
be_nossh.$(OBJ): be_nossh.c network.h puttymem.h putty.h be_nossh.$(OBJ): be_nossh.c network.h misc.h puttymem.h putty.h
bntest.$(OBJ): bntest.c puttymem.h ssh.h ber.$(OBJ): ber.c network.h asn.h misc.h asnerror.h puttymem.h ssh.h putty.h
int64.$(OBJ): int64.c cert.$(OBJ): cert.c asn.h asnerror.h misc.h puttymem.h cert.h crypto.h
ldisc.$(OBJ): ldisc.c network.h puttymem.h putty.h int64.$(OBJ): int64.c int64.h
misc.$(OBJ): misc.c network.h puttymem.h putty.h ldisc.$(OBJ): ldisc.c network.h misc.h puttymem.h putty.h
mscrypto.$(OBJ): mscrypto.c puttymem.h ssh.h misc.$(OBJ): misc.c network.h misc.h puttymem.h putty.h
noise.$(OBJ): noise.c network.h puttymem.h storage.h ssh.h putty.h mscrypto.$(OBJ): mscrypto.c network.h puttymem.h ssh.h
pageant.$(OBJ): pageant.c puttymem.h ssh.h tree234.h no_ssl.$(OBJ): no_ssl.c network.h misc.h puttymem.h putty.h
noise.$(OBJ): noise.c network.h misc.h puttymem.h storage.h ssh.h putty.h
pageant.$(OBJ): pageant.c network.h puttymem.h ssh.h tree234.h
pageantc.$(OBJ): pageantc.c puttymem.h pageantc.$(OBJ): pageantc.c puttymem.h
plink.$(OBJ): plink.c network.h puttymem.h storage.h putty.h tree234.h plink.$(OBJ): plink.c network.h misc.h puttymem.h storage.h putty.h tree234.h
psftp.$(OBJ): psftp.c network.h puttymem.h int64.h sftp.h storage.h ssh.h putty.h portfwd.$(OBJ): portfwd.c network.h misc.h puttymem.h ssh.h putty.h
puttygen.$(OBJ): puttygen.c network.h puttymem.h winstuff.h ssh.h putty.h psftp.$(OBJ): psftp.c network.h misc.h sftp.h ssh.h storage.h int64.h puttymem.h putty.h
raw.$(OBJ): raw.c network.h puttymem.h putty.h puttygen.$(OBJ): puttygen.c network.h misc.h puttymem.h winstuff.h ssh.h putty.h
rlogin.$(OBJ): rlogin.c network.h puttymem.h putty.h raw.$(OBJ): raw.c network.h misc.h puttymem.h putty.h
scp.$(OBJ): scp.c network.h puttymem.h storage.h winstuff.h putty.h rlogin.$(OBJ): rlogin.c network.h misc.h puttymem.h putty.h
settings.$(OBJ): settings.c network.h puttymem.h storage.h putty.h scp.$(OBJ): scp.c network.h misc.h sftp.h ssh.h storage.h puttymem.h int64.h putty.h winstuff.h
settings.$(OBJ): settings.c network.h misc.h puttymem.h storage.h putty.h
sftp.$(OBJ): sftp.c sftp.h int64.h sftp.$(OBJ): sftp.c sftp.h int64.h
sizetip.$(OBJ): sizetip.c network.h puttymem.h winstuff.h putty.h sizetip.$(OBJ): sizetip.c network.h misc.h puttymem.h winstuff.h putty.h
ssh.$(OBJ): ssh.c network.h puttymem.h ssh.h putty.h tree234.h ssh.$(OBJ): ssh.c network.h misc.h puttymem.h ssh.h putty.h tree234.h
sshaes.$(OBJ): sshaes.c puttymem.h ssh.h sshaes.$(OBJ): sshaes.c network.h puttymem.h ssh.h
sshblowf.$(OBJ): sshblowf.c puttymem.h ssh.h sshblowf.$(OBJ): sshblowf.c network.h puttymem.h ssh.h
sshbn.$(OBJ): sshbn.c network.h puttymem.h ssh.h putty.h sshbn.$(OBJ): sshbn.c network.h misc.h puttymem.h ssh.h putty.h
sshcrc.$(OBJ): sshcrc.c sshcrc.$(OBJ): sshcrc.c
sshdes.$(OBJ): sshdes.c puttymem.h ssh.h sshdes.$(OBJ): sshdes.c network.h puttymem.h ssh.h
sshdh.$(OBJ): sshdh.c puttymem.h ssh.h sshdh.$(OBJ): sshdh.c network.h puttymem.h ssh.h
sshdss.$(OBJ): sshdss.c puttymem.h ssh.h sshdss.$(OBJ): sshdss.c network.h puttymem.h ssh.h
sshmd5.$(OBJ): sshmd5.c puttymem.h ssh.h sshmd5.$(OBJ): sshmd5.c network.h puttymem.h ssh.h
sshprime.$(OBJ): sshprime.c puttymem.h ssh.h sshprime.$(OBJ): sshprime.c network.h puttymem.h ssh.h
sshpubk.$(OBJ): sshpubk.c puttymem.h ssh.h sshpubk.$(OBJ): sshpubk.c network.h puttymem.h ssh.h
sshrand.$(OBJ): sshrand.c puttymem.h ssh.h sshrand.$(OBJ): sshrand.c network.h puttymem.h ssh.h
sshrsa.$(OBJ): sshrsa.c puttymem.h ssh.h sshrsa.$(OBJ): sshrsa.c network.h puttymem.h ssh.h
sshrsag.$(OBJ): sshrsag.c puttymem.h ssh.h sshrsag.$(OBJ): sshrsag.c network.h puttymem.h ssh.h
sshsha.$(OBJ): sshsha.c puttymem.h ssh.h sshsha.$(OBJ): sshsha.c network.h puttymem.h ssh.h
sshzlib.$(OBJ): sshzlib.c network.h puttymem.h ssh.h putty.h sshzlib.$(OBJ): sshzlib.c network.h puttymem.h ssh.h
telnet.$(OBJ): telnet.c network.h puttymem.h putty.h ssl.$(OBJ): ssl.c network.h asnerror.h misc.h cert.h crypto.h ssl.h int64.h puttymem.h
terminal.$(OBJ): terminal.c network.h puttymem.h putty.h tree234.h telnet.$(OBJ): telnet.c network.h misc.h puttymem.h putty.h
terminal.$(OBJ): terminal.c network.h misc.h puttymem.h putty.h tree234.h
test.$(OBJ): test.c network.h puttymem.h ssh.h
tree234.$(OBJ): tree234.c tree234.h tree234.$(OBJ): tree234.c tree234.h
unicode.$(OBJ): unicode.c network.h misc.h puttymem.h putty.h
version.$(OBJ): version.c version.$(OBJ): version.c
winctrls.$(OBJ): winctrls.c winstuff.h wcwidth.$(OBJ): wcwidth.c
windlg.$(OBJ): windlg.c network.h puttymem.h storage.h winstuff.h putty.h ssh.h win_res.h wildcard.$(OBJ): wildcard.c
window.$(OBJ): window.c network.h puttymem.h storage.h winstuff.h putty.h win_res.h winctrls.$(OBJ): winctrls.c network.h misc.h puttymem.h putty.h winstuff.h
winnet.$(OBJ): winnet.c network.h puttymem.h putty.h tree234.h windlg.$(OBJ): windlg.c network.h misc.h ssh.h storage.h puttymem.h putty.h winstuff.h win_res.h
winstore.$(OBJ): winstore.c network.h puttymem.h storage.h putty.h window.$(OBJ): window.c network.h misc.h puttymem.h storage.h winstuff.h putty.h win_res.h
x11fwd.$(OBJ): x11fwd.c network.h puttymem.h ssh.h putty.h winnet.$(OBJ): winnet.c network.h misc.h puttymem.h putty.h tree234.h
portfwd.$(OBJ): portfwd.c network.h puttymem.h ssh.h putty.h winstore.$(OBJ): winstore.c network.h misc.h puttymem.h storage.h putty.h
xlat.$(OBJ): xlat.c network.h puttymem.h putty.h x11fwd.$(OBJ): x11fwd.c network.h misc.h puttymem.h ssh.h putty.h
##-- ##--
# Hack to force version.obj to be rebuilt always # Hack to force version.obj to be rebuilt always

3
mkfiles.pl
View File

@ -76,7 +76,8 @@ print
"# You may also need to tell windres where to find include files:\n". "# You may also need to tell windres where to find include files:\n".
"# RCINC = --include-dir c:\\cygwin\\include\\\n". "# RCINC = --include-dir c:\\cygwin\\include\\\n".
"\n". "\n".
"CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT -D_NO_OLDNAMES -I.\n". "CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
" -DNO_SECURITY -D_NO_OLDNAMES -I.\n".
"LDFLAGS = -mno-cygwin -s\n". "LDFLAGS = -mno-cygwin -s\n".
"RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400 --define MINGW32_FIX=1\n". "RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400 --define MINGW32_FIX=1\n".
"LIBS = -ladvapi32 -luser32 -lgdi32 -lwsock32 -lcomctl32 -lcomdlg32 -lwinmm -limm32\n". "LIBS = -ladvapi32 -luser32 -lgdi32 -lwsock32 -lcomctl32 -lcomdlg32 -lwinmm -limm32\n".

2
ssh.h
View File

@ -3,6 +3,8 @@
#include "puttymem.h" #include "puttymem.h"
#include "network.h" #include "network.h"
struct ssh_channel;
extern void sshfwd_close(struct ssh_channel *c); extern void sshfwd_close(struct ssh_channel *c);
extern int sshfwd_write(struct ssh_channel *c, char *, int); extern int sshfwd_write(struct ssh_channel *c, char *, int);
extern void sshfwd_unthrottle(struct ssh_channel *c, int bufsize); extern void sshfwd_unthrottle(struct ssh_channel *c, int bufsize);