X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/4eb24e3afad8d039e4dca20fb337977f0e436957..9a3a93a5c6a879994d61da8a146142a6555fd5d0:/Makefile diff --git a/Makefile b/Makefile index f8917502..6ae9268b 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,21 @@ # will run fine on Win95-series OSes where there is no access # control anyway). # +# Note that this definition is always enabled in the Cygwin +# build, since at the time of writing this is known +# not to be available in Cygwin. +# +# - COMPAT=/DNO_MULTIMON +# Disables PuTTY's use of , which is not available +# with some development environments. This means that PuTTY's +# full-screen mode (configurable to work on Alt-Enter) will +# not behave usefully in a multi-monitor environment. +# +# - COMPAT=/DMSVC4 +# - 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 # Uses ASCII rather than Unicode to specify the tab control in # the resource file. Probably most useful when compiling with @@ -63,7 +78,7 @@ # LFLAGS = /debug # Disable debug and incremental linking and compiling -CFLAGS = /nologo /W3 /O1 /D_WINDOWS /D_WIN32_WINDOWS=0x401 +CFLAGS = /nologo /W3 /O1 /D_WINDOWS /D_WIN32_WINDOWS=0x401 /DWINVER=0x401 LFLAGS = /incremental:no /fixed # Use MSVC DLL @@ -78,7 +93,7 @@ RES=res ##-- objects putty puttytel GOBJS1 = window.$(OBJ) windlg.$(OBJ) winctrls.$(OBJ) terminal.$(OBJ) -GOBJS2 = sizetip.$(OBJ) wcwidth.$(OBJ) unicode.$(OBJ) +GOBJS2 = sizetip.$(OBJ) wcwidth.$(OBJ) unicode.$(OBJ) logging.$(OBJ) ##-- objects putty puttytel plink LOBJS1 = telnet.$(OBJ) raw.$(OBJ) rlogin.$(OBJ) ldisc.$(OBJ) winnet.$(OBJ) ##-- objects putty plink @@ -86,30 +101,32 @@ POBJS = be_all.$(OBJ) ##-- objects puttytel TOBJS = be_nossh.$(OBJ) ##-- objects plink -PLOBJS = plink.$(OBJ) +PLOBJS = plink.$(OBJ) logging.$(OBJ) ##-- objects pscp SOBJS = scp.$(OBJ) winnet.$(OBJ) be_none.$(OBJ) wildcard.$(OBJ) ##-- objects psftp FOBJS = psftp.$(OBJ) winnet.$(OBJ) be_none.$(OBJ) ##-- objects pscp psftp -SFOBJS = sftp.$(OBJ) int64.$(OBJ) +SFOBJS = sftp.$(OBJ) int64.$(OBJ) logging.$(OBJ) ##-- objects putty puttytel pscp psftp plink MOBJS = misc.$(OBJ) version.$(OBJ) winstore.$(OBJ) settings.$(OBJ) MOBJ2 = tree234.$(OBJ) +##-- objects pscp psftp plink +COBJS = console.$(OBJ) ##-- objects putty pscp psftp plink OBJS1 = sshcrc.$(OBJ) sshdes.$(OBJ) sshmd5.$(OBJ) sshrsa.$(OBJ) sshrand.$(OBJ) -OBJS2 = sshsha.$(OBJ) sshblowf.$(OBJ) noise.$(OBJ) sshdh.$(OBJ) sshdss.$(OBJ) -OBJS3 = sshbn.$(OBJ) sshpubk.$(OBJ) ssh.$(OBJ) pageantc.$(OBJ) sshzlib.$(OBJ) -OBJS4 = x11fwd.$(OBJ) portfwd.$(OBJ) sshaes.$(OBJ) +OBJS2 = sshsha.$(OBJ) sshblowf.$(OBJ) noise.$(OBJ) sshdh.$(OBJ) sshcrcda.$(OBJ) +OBJS3 = sshpubk.$(OBJ) ssh.$(OBJ) pageantc.$(OBJ) sshzlib.$(OBJ) sshdss.$(OBJ) +OBJS4 = x11fwd.$(OBJ) portfwd.$(OBJ) sshaes.$(OBJ) sshsh512.$(OBJ) sshbn.$(OBJ) ##-- objects pageant PAGE1 = pageant.$(OBJ) sshrsa.$(OBJ) sshpubk.$(OBJ) sshdes.$(OBJ) sshbn.$(OBJ) PAGE2 = sshmd5.$(OBJ) version.$(OBJ) tree234.$(OBJ) misc.$(OBJ) sshaes.$(OBJ) -PAGE3 = sshsha.$(OBJ) pageantc.$(OBJ) +PAGE3 = sshsha.$(OBJ) pageantc.$(OBJ) sshdss.$(OBJ) sshsh512.$(OBJ) ##-- objects puttygen -GEN1 = puttygen.$(OBJ) sshrsag.$(OBJ) sshprime.$(OBJ) sshdes.$(OBJ) -GEN2 = sshbn.$(OBJ) sshmd5.$(OBJ) version.$(OBJ) sshrand.$(OBJ) noise.$(OBJ) -GEN3 = sshsha.$(OBJ) winstore.$(OBJ) misc.$(OBJ) winctrls.$(OBJ) -GEN4 = sshrsa.$(OBJ) sshpubk.$(OBJ) sshaes.$(OBJ) +GEN1 = puttygen.$(OBJ) sshrsag.$(OBJ) sshdssg.$(OBJ) sshprime.$(OBJ) +GEN2 = sshdes.$(OBJ) sshbn.$(OBJ) sshmd5.$(OBJ) version.$(OBJ) sshrand.$(OBJ) +GEN3 = noise.$(OBJ) sshsha.$(OBJ) winstore.$(OBJ) misc.$(OBJ) winctrls.$(OBJ) +GEN4 = sshrsa.$(OBJ) sshdss.$(OBJ) sshpubk.$(OBJ) sshaes.$(OBJ) sshsh512.$(OBJ) ##-- resources putty puttytel PRESRC = win_res.$(RES) ##-- resources pageant @@ -154,17 +171,17 @@ pageant.exe: $(PAGE1) $(PAGE2) $(PAGE3) $(PAGERC) pageant.rsp puttygen.exe: $(GEN1) $(GEN2) $(GEN3) $(GEN4) $(GENRC) puttygen.rsp link $(LFLAGS) -out:puttygen.exe -map:puttygen.map @puttygen.rsp -pscp.exe: $(SOBJS) $(SFOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) pscp.rsp +pscp.exe: $(SOBJS) $(SFOBJS) $(COBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) pscp.rsp link $(LFLAGS) -out:pscp.exe -map:pscp.map @pscp.rsp -psftp.exe: $(FOBJS) $(SFOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) psftp.rsp +psftp.exe: $(FOBJS) $(SFOBJS) $(COBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) psftp.rsp link $(LFLAGS) -out:psftp.exe -map:psftp.map @psftp.rsp -plink.exe: $(LOBJS1) $(POBJS) $(PLOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(LRESRC) plink.rsp +plink.exe: $(LOBJS1) $(POBJS) $(PLOBJS) $(COBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(LRESRC) plink.rsp link $(LFLAGS) -out:plink.exe -map:plink.map @plink.rsp ssh.obj: - cl $(FWHACK) $(VER) $(CFLAGS) /Gi- /c ssh.c + cl $(COMPAT) $(FWHACK) $(VER) $(XFLAGS) $(CFLAGS) /Gi- /c ssh.c putty.rsp: makefile echo /nologo /subsystem:windows > putty.rsp @@ -223,6 +240,7 @@ pscp.rsp: makefile echo /nologo /subsystem:console > pscp.rsp echo $(SOBJS) >> pscp.rsp echo $(SFOBJS) >> pscp.rsp + echo $(COBJS) >> pscp.rsp echo $(MOBJS) >> pscp.rsp echo $(MOBJ2) >> pscp.rsp echo $(OBJS1) >> pscp.rsp @@ -238,6 +256,7 @@ psftp.rsp: makefile echo /nologo /subsystem:console > psftp.rsp echo $(FOBJS) >> psftp.rsp echo $(SFOBJS) >> psftp.rsp + echo $(COBJS) >> psftp.rsp echo $(MOBJS) >> psftp.rsp echo $(MOBJ2) >> psftp.rsp echo $(OBJS1) >> psftp.rsp @@ -254,6 +273,7 @@ plink.rsp: makefile echo $(LOBJS1) >> plink.rsp echo $(POBJS) >> plink.rsp echo $(PLOBJS) >> plink.rsp + echo $(COBJS) >> plink.rsp echo $(MOBJS) >> plink.rsp echo $(MOBJ2) >> plink.rsp echo $(OBJS1) >> plink.rsp @@ -266,54 +286,64 @@ plink.rsp: makefile echo $(SOCK2) >> plink.rsp ##-- dependencies -be_all.$(OBJ): be_all.c network.h puttymem.h putty.h -be_none.$(OBJ): be_none.c network.h puttymem.h putty.h -be_nossh.$(OBJ): be_nossh.c network.h puttymem.h putty.h -bntest.$(OBJ): bntest.c puttymem.h ssh.h -int64.$(OBJ): int64.c -ldisc.$(OBJ): ldisc.c network.h puttymem.h putty.h -misc.$(OBJ): misc.c network.h puttymem.h putty.h -mscrypto.$(OBJ): mscrypto.c puttymem.h ssh.h -noise.$(OBJ): noise.c network.h puttymem.h storage.h ssh.h putty.h -pageant.$(OBJ): pageant.c puttymem.h ssh.h tree234.h +be_all.$(OBJ): be_all.c network.h misc.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 misc.h puttymem.h putty.h +ber.$(OBJ): ber.c network.h asn.h misc.h asnerror.h int64.h puttymem.h ssh.h putty.h +cert.$(OBJ): cert.c asn.h asnerror.h misc.h puttymem.h cert.h crypto.h +debug.$(OBJ): debug.c debug.h +int64.$(OBJ): int64.c int64.h +ldisc.$(OBJ): ldisc.c network.h misc.h puttymem.h putty.h +misc.$(OBJ): misc.c network.h misc.h puttymem.h putty.h +mscrypto.$(OBJ): mscrypto.c network.h int64.h puttymem.h ssh.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 int64.h ssh.h putty.h +pageant.$(OBJ): pageant.c network.h int64.h puttymem.h ssh.h tree234.h pageantc.$(OBJ): pageantc.c puttymem.h -plink.$(OBJ): plink.c network.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 -puttygen.$(OBJ): puttygen.c network.h puttymem.h winstuff.h ssh.h putty.h -raw.$(OBJ): raw.c network.h puttymem.h putty.h -rlogin.$(OBJ): rlogin.c network.h puttymem.h putty.h -scp.$(OBJ): scp.c network.h puttymem.h storage.h winstuff.h putty.h -settings.$(OBJ): settings.c network.h puttymem.h storage.h putty.h +plink.$(OBJ): plink.c network.h misc.h puttymem.h storage.h putty.h tree234.h +portfwd.$(OBJ): portfwd.c network.h misc.h int64.h puttymem.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 +puttygen.$(OBJ): puttygen.c network.h misc.h int64.h puttymem.h winstuff.h ssh.h putty.h +raw.$(OBJ): raw.c network.h misc.h puttymem.h putty.h +rlogin.$(OBJ): rlogin.c network.h misc.h puttymem.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 -sizetip.$(OBJ): sizetip.c network.h puttymem.h winstuff.h putty.h -ssh.$(OBJ): ssh.c network.h puttymem.h ssh.h putty.h tree234.h -sshaes.$(OBJ): sshaes.c puttymem.h ssh.h -sshblowf.$(OBJ): sshblowf.c puttymem.h ssh.h -sshbn.$(OBJ): sshbn.c network.h puttymem.h ssh.h putty.h +sizetip.$(OBJ): sizetip.c network.h misc.h puttymem.h winstuff.h putty.h +ssh.$(OBJ): ssh.c network.h misc.h int64.h puttymem.h ssh.h putty.h tree234.h +sshaes.$(OBJ): sshaes.c network.h int64.h puttymem.h ssh.h +sshblowf.$(OBJ): sshblowf.c network.h int64.h puttymem.h ssh.h +sshbn.$(OBJ): sshbn.c network.h misc.h int64.h puttymem.h ssh.h putty.h sshcrc.$(OBJ): sshcrc.c -sshdes.$(OBJ): sshdes.c puttymem.h ssh.h -sshdh.$(OBJ): sshdh.c puttymem.h ssh.h -sshdss.$(OBJ): sshdss.c puttymem.h ssh.h -sshmd5.$(OBJ): sshmd5.c puttymem.h ssh.h -sshprime.$(OBJ): sshprime.c puttymem.h ssh.h -sshpubk.$(OBJ): sshpubk.c puttymem.h ssh.h -sshrand.$(OBJ): sshrand.c puttymem.h ssh.h -sshrsa.$(OBJ): sshrsa.c puttymem.h ssh.h -sshrsag.$(OBJ): sshrsag.c puttymem.h ssh.h -sshsha.$(OBJ): sshsha.c puttymem.h ssh.h -sshzlib.$(OBJ): sshzlib.c network.h puttymem.h ssh.h putty.h -telnet.$(OBJ): telnet.c network.h puttymem.h putty.h -terminal.$(OBJ): terminal.c network.h puttymem.h putty.h tree234.h +sshdes.$(OBJ): sshdes.c network.h int64.h puttymem.h ssh.h +sshdh.$(OBJ): sshdh.c network.h int64.h puttymem.h ssh.h +sshdss.$(OBJ): sshdss.c network.h misc.h int64.h puttymem.h ssh.h +sshdssg.$(OBJ): sshdssg.c network.h misc.h int64.h puttymem.h ssh.h +sshmd5.$(OBJ): sshmd5.c network.h int64.h puttymem.h ssh.h +sshprime.$(OBJ): sshprime.c network.h int64.h puttymem.h ssh.h +sshpubk.$(OBJ): sshpubk.c network.h int64.h puttymem.h ssh.h +sshrand.$(OBJ): sshrand.c network.h int64.h puttymem.h ssh.h +sshrsa.$(OBJ): sshrsa.c network.h int64.h puttymem.h ssh.h +sshrsag.$(OBJ): sshrsag.c network.h int64.h puttymem.h ssh.h +sshsh512.$(OBJ): sshsh512.c network.h int64.h puttymem.h ssh.h +sshsha.$(OBJ): sshsha.c network.h int64.h puttymem.h ssh.h +sshzlib.$(OBJ): sshzlib.c network.h int64.h puttymem.h ssh.h +ssl.$(OBJ): ssl.c network.h asnerror.h misc.h cert.h crypto.h ssl.h int64.h puttymem.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 +logging.$(OBJ): logging.c misc.h puttymem.h putty.h +test.$(OBJ): test.c network.h int64.h puttymem.h ssh.h tree234.$(OBJ): tree234.c tree234.h +unicode.$(OBJ): unicode.c network.h misc.h puttymem.h putty.h version.$(OBJ): version.c -winctrls.$(OBJ): winctrls.c winstuff.h -windlg.$(OBJ): windlg.c network.h puttymem.h storage.h winstuff.h putty.h ssh.h win_res.h -window.$(OBJ): window.c network.h puttymem.h storage.h winstuff.h putty.h win_res.h -winnet.$(OBJ): winnet.c network.h puttymem.h putty.h tree234.h -winstore.$(OBJ): winstore.c network.h puttymem.h storage.h putty.h -x11fwd.$(OBJ): x11fwd.c network.h puttymem.h ssh.h putty.h -portfwd.$(OBJ): portfwd.c network.h puttymem.h ssh.h putty.h -xlat.$(OBJ): xlat.c network.h puttymem.h putty.h +wcwidth.$(OBJ): wcwidth.c +wildcard.$(OBJ): wildcard.c +winctrls.$(OBJ): winctrls.c network.h misc.h puttymem.h putty.h winstuff.h +windlg.$(OBJ): windlg.c network.h misc.h ssh.h storage.h puttymem.h int64.h putty.h winstuff.h win_res.h +window.$(OBJ): window.c network.h misc.h puttymem.h storage.h winstuff.h putty.h win_res.h +winnet.$(OBJ): winnet.c network.h misc.h puttymem.h putty.h tree234.h +winstore.$(OBJ): winstore.c network.h misc.h puttymem.h storage.h putty.h +x11fwd.$(OBJ): x11fwd.c network.h misc.h int64.h puttymem.h ssh.h putty.h ##-- # Hack to force version.obj to be rebuilt always