X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/4d331a77f20f321f867f5907e2ffc06249378881..fd5e5847eb0f834ce8124f0574bd3cfaf878db53:/Makefile

diff --git a/Makefile b/Makefile
index 13419307..1d9c30d1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,6 @@
 #      Generates executables whose About box report them as being a
 #      release version.
 #
-#  - COMPAT=/DWIN32S_COMPAT
-#      Generates a binary that works (minimally) with Win32s.
-#
 #  - COMPAT=/DAUTO_WINSOCK
 #      Causes PuTTY to assume that <windows.h> includes its own WinSock
 #      header file, so that it won't try to include <winsock.h>.
@@ -30,58 +27,96 @@
 #      <winsock.h>, except Plink which _needs_ WinSock 2 so it already
 #      does this.
 #
+#  - COMPAT=/DNO_SECURITY
+#      Disables Pageant's use of <aclapi.h>, which is not available
+#      with some development environments. This means that Pageant
+#      won't care about the local user ID of processes accessing it; a
+#      version of Pageant built with this option will therefore refuse
+#      to run under NT-series OSes on security grounds (although it
+#      will run fine on Win95-series OSes where there is no access
+#      control anyway).
+#
 #  - RCFL=/DASCIICTLS
 #      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
 #      problem with it.
 #
+#  - XFLAGS=/DDEBUG
+#      Causes PuTTY to enable internal debugging.
+#
+#  - XFLAGS=/DMALLOC_LOG
+#      Causes PuTTY to emit a file called putty_mem.log, logging every
+#      memory allocation and free, so you can track memory leaks.
+#
+#  - XFLAGS=/DMINEFIELD
+#      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
+#      show up as GPFs at the point of failure rather than appearing
+#      later on as second-level damage.
+#
 ##--
 
-CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /ML /Fd
+# Enable debug and incremental linking and compiling
+# CFLAGS = /nologo /W3 /YX /Yd /O1 /Gi /D_WINDOWS /DDEBUG /D_WIN32_WINDOWS=0x401
 # LFLAGS = /debug
 
-# Use MSVC DLL
-# CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /MD /Fd
+# Disable debug and incremental linking and compiling
+CFLAGS = /nologo /W3 /O1 /D_WINDOWS /D_WIN32_WINDOWS=0x401
+LFLAGS = /incremental:no /fixed
 
-# Disable debug and incremental linking
-LFLAGS = /incremental:no
+# Use MSVC DLL
+# CFLAGS = /nologo /W3 /O1 /MD /D_WINDOWS /D_WIN32_WINDOWS=0x401
+# LFLAGS = /incremental:no
 
 .c.obj:
-	cl $(COMPAT) $(FWHACK) $(CFLAGS) /c $*.c
+	cl $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) /c $*.c
 
 OBJ=obj
 RES=res
 
 ##-- objects putty puttytel
-GOBJS1 = window.$(OBJ) windlg.$(OBJ) terminal.$(OBJ)
-GOBJS2 = xlat.$(OBJ) sizetip.$(OBJ)
+GOBJS1 = window.$(OBJ) windlg.$(OBJ) winctrls.$(OBJ) terminal.$(OBJ)
+GOBJS2 = sizetip.$(OBJ) wcwidth.$(OBJ) unicode.$(OBJ)
 ##-- objects putty puttytel plink
-LOBJS1 = telnet.$(OBJ) raw.$(OBJ) ldisc.$(OBJ)
+LOBJS1 = telnet.$(OBJ) raw.$(OBJ) rlogin.$(OBJ) ldisc.$(OBJ) winnet.$(OBJ)
 ##-- objects putty plink
 POBJS = be_all.$(OBJ)
 ##-- objects puttytel
 TOBJS = be_nossh.$(OBJ)
 ##-- objects plink
-PLOBJS = plink.$(OBJ) windlg.$(OBJ)
+PLOBJS = plink.$(OBJ)
 ##-- objects pscp
-SOBJS = scp.$(OBJ) windlg.$(OBJ) be_none.$(OBJ)
-##-- objects putty puttytel pscp plink
-MOBJS = misc.$(OBJ) version.$(OBJ)
-##-- objects putty pscp plink
+SOBJS = scp.$(OBJ) winnet.$(OBJ) be_none.$(OBJ)
+##-- objects psftp
+FOBJS = psftp.$(OBJ) winnet.$(OBJ) be_none.$(OBJ)
+##-- objects pscp psftp
+SFOBJS = sftp.$(OBJ) int64.$(OBJ)
+##-- objects putty puttytel pscp psftp plink
+MOBJS = misc.$(OBJ) version.$(OBJ) winstore.$(OBJ) settings.$(OBJ)
+MOBJ2 = tree234.$(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) tree234.$(OBJ)
+OBJS3 = sshbn.$(OBJ) sshpubk.$(OBJ) ssh.$(OBJ) pageantc.$(OBJ) sshzlib.$(OBJ)
+OBJS4 = x11fwd.$(OBJ) portfwd.$(OBJ) sshaes.$(OBJ)
 ##-- objects pageant
 PAGE1 = pageant.$(OBJ) sshrsa.$(OBJ) sshpubk.$(OBJ) sshdes.$(OBJ) sshbn.$(OBJ)
-PAGE2 = sshmd5.$(OBJ) version.$(OBJ) tree234.$(OBJ)
-##-- resources putty
+PAGE2 = sshmd5.$(OBJ) version.$(OBJ) tree234.$(OBJ) misc.$(OBJ) sshaes.$(OBJ)
+PAGE3 = sshsha.$(OBJ) pageantc.$(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)
+##-- resources putty puttytel
 PRESRC = win_res.$(RES)
-##-- resources puttytel
-TRESRC = nosshres.$(RES)
 ##-- resources pageant
 PAGERC = pageant.$(RES)
-##-- resources pscp
+##-- resources puttygen
+GENRC = puttygen.$(RES)
+##-- resources pscp psftp
 SRESRC = scp.$(RES)
 ##-- resources plink
 LRESRC = plink.$(RES)
@@ -91,33 +126,45 @@ LRESRC = plink.$(RES)
 # putty
 # puttytel
 # pageant
+# puttygen
 ##-- console-apps
 # pscp
-# plink
+# psftp
+# plink ws2_32
 ##--
 
 LIBS1 = advapi32.lib user32.lib gdi32.lib
 LIBS2 = comctl32.lib comdlg32.lib
-LIBS3 = shell32.lib
+LIBS3 = shell32.lib winmm.lib imm32.lib
 SOCK1 = wsock32.lib
 SOCK2 = ws2_32.lib
 
-all: putty.exe puttytel.exe pscp.exe plink.exe pageant.exe
+all: putty.exe puttytel.exe pscp.exe psftp.exe \
+     plink.exe pageant.exe puttygen.exe
+
+putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(PRESRC) putty.rsp
+	link $(LFLAGS) -out:putty.exe -map:putty.map @putty.rsp
+
+puttytel.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(TOBJS) $(MOBJS) $(MOBJ2) $(PRESRC) puttytel.rsp
+	link $(LFLAGS) -out:puttytel.exe -map:puttytel.map @puttytel.rsp
+
+pageant.exe: $(PAGE1) $(PAGE2) $(PAGE3) $(PAGERC) pageant.rsp
+	link $(LFLAGS) -out:pageant.exe -map:pageant.map @pageant.rsp
 
-putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(PRESRC) putty.rsp
-	link $(LFLAGS) -out:putty.exe @putty.rsp
+puttygen.exe: $(GEN1) $(GEN2) $(GEN3) $(GEN4) $(GENRC) puttygen.rsp
+	link $(LFLAGS) -out:puttygen.exe -map:puttygen.map @puttygen.rsp
 
-puttytel.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(TOBJS) $(MOBJS) $(TRESRC) puttytel.rsp
-	link $(LFLAGS) -out:puttytel.exe @puttytel.rsp
+pscp.exe: $(SOBJS) $(SFOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) pscp.rsp
+	link $(LFLAGS) -out:pscp.exe -map:pscp.map @pscp.rsp
 
-pageant.exe: $(PAGE1) $(PAGE2) $(PAGERC) pageant.rsp
-	link $(LFLAGS) -out:pageant.exe @pageant.rsp
+psftp.exe: $(FOBJS) $(SFOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) psftp.rsp
+	link $(LFLAGS) -out:psftp.exe -map:psftp.map @psftp.rsp
 
-pscp.exe: $(SOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(SRESRC) pscp.rsp
-	link $(LFLAGS) -out:pscp.exe @pscp.rsp
+plink.exe: $(LOBJS1) $(POBJS) $(PLOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(LRESRC) plink.rsp
+	link $(LFLAGS) -out:plink.exe -map:plink.map @plink.rsp
 
-plink.exe: $(LOBJS1) $(POBJS) $(PLOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(LRESRC) plink.rsp
-	link $(LFLAGS) -out:plink.exe @plink.rsp
+ssh.obj:
+	cl $(FWHACK) $(VER) $(CFLAGS) /Gi- /c ssh.c
 
 putty.rsp: makefile
 	echo /nologo /subsystem:windows > putty.rsp
@@ -126,12 +173,15 @@ putty.rsp: makefile
 	echo $(LOBJS1) >> putty.rsp
 	echo $(POBJS) >> putty.rsp
 	echo $(MOBJS) >> putty.rsp
+	echo $(MOBJ2) >> putty.rsp
 	echo $(OBJS1) >> putty.rsp
 	echo $(OBJS2) >> putty.rsp
 	echo $(OBJS3) >> putty.rsp
+	echo $(OBJS4) >> putty.rsp
 	echo $(PRESRC) >> putty.rsp
 	echo $(LIBS1) >> putty.rsp
 	echo $(LIBS2) >> putty.rsp
+	echo $(LIBS3) >> putty.rsp
 	echo $(SOCK1) >> putty.rsp
 
 puttytel.rsp: makefile
@@ -141,83 +191,133 @@ puttytel.rsp: makefile
 	echo $(LOBJS1) >> puttytel.rsp
 	echo $(TOBJS) >> puttytel.rsp
 	echo $(MOBJS) >> puttytel.rsp
-	echo $(TRESRC) >> puttytel.rsp
+	echo $(MOBJ2) >> puttytel.rsp
+	echo $(PRESRC) >> puttytel.rsp
 	echo $(LIBS1) >> puttytel.rsp
 	echo $(LIBS2) >> puttytel.rsp
+	echo $(LIBS3) >> puttytel.rsp
 	echo $(SOCK1) >> puttytel.rsp
 
 pageant.rsp: makefile
 	echo /nologo /subsystem:windows > pageant.rsp
-        echo $(PAGE1) >> pageant.rsp
-        echo $(PAGE2) >> pageant.rsp
-        echo $(PAGERC) >> pageant.rsp
+	echo $(PAGE1) >> pageant.rsp
+	echo $(PAGE2) >> pageant.rsp
+	echo $(PAGE3) >> pageant.rsp
+	echo $(PAGERC) >> pageant.rsp
 	echo $(LIBS1) >> pageant.rsp
 	echo $(LIBS2) >> pageant.rsp
 	echo $(LIBS3) >> pageant.rsp
 
+puttygen.rsp: makefile
+	echo /nologo /subsystem:windows > puttygen.rsp
+	echo $(GEN1) >> puttygen.rsp
+	echo $(GEN2) >> puttygen.rsp
+	echo $(GEN3) >> puttygen.rsp
+	echo $(GEN4) >> puttygen.rsp
+	echo $(GENRC) >> puttygen.rsp
+	echo $(LIBS1) >> puttygen.rsp
+	echo $(LIBS2) >> puttygen.rsp
+	echo $(LIBS3) >> puttygen.rsp
+
 pscp.rsp: makefile
 	echo /nologo /subsystem:console > pscp.rsp
 	echo $(SOBJS) >> pscp.rsp
+	echo $(SFOBJS) >> pscp.rsp
 	echo $(MOBJS) >> pscp.rsp
+	echo $(MOBJ2) >> pscp.rsp
 	echo $(OBJS1) >> pscp.rsp
 	echo $(OBJS2) >> pscp.rsp
 	echo $(OBJS3) >> pscp.rsp
+	echo $(OBJS4) >> pscp.rsp
 	echo $(SRESRC) >> pscp.rsp
 	echo $(LIBS1) >> pscp.rsp
 	echo $(LIBS2) >> pscp.rsp
 	echo $(SOCK1) >> pscp.rsp
 
+psftp.rsp: makefile
+	echo /nologo /subsystem:console > psftp.rsp
+	echo $(FOBJS) >> psftp.rsp
+	echo $(SFOBJS) >> psftp.rsp
+	echo $(MOBJS) >> psftp.rsp
+	echo $(MOBJ2) >> psftp.rsp
+	echo $(OBJS1) >> psftp.rsp
+	echo $(OBJS2) >> psftp.rsp
+	echo $(OBJS3) >> psftp.rsp
+	echo $(OBJS4) >> psftp.rsp
+	echo $(SRESRC) >> psftp.rsp
+	echo $(LIBS1) >> psftp.rsp
+	echo $(LIBS2) >> psftp.rsp
+	echo $(SOCK1) >> psftp.rsp
+
 plink.rsp: makefile
 	echo /nologo /subsystem:console > plink.rsp
 	echo $(LOBJS1) >> plink.rsp
 	echo $(POBJS) >> plink.rsp
 	echo $(PLOBJS) >> plink.rsp
 	echo $(MOBJS) >> plink.rsp
+	echo $(MOBJ2) >> plink.rsp
 	echo $(OBJS1) >> plink.rsp
 	echo $(OBJS2) >> plink.rsp
 	echo $(OBJS3) >> plink.rsp
+	echo $(OBJS4) >> plink.rsp
 	echo $(LRESRC) >> plink.rsp
 	echo $(LIBS1) >> plink.rsp
  	echo $(LIBS2) >> plink.rsp
  	echo $(SOCK2) >> plink.rsp
 
 ##-- dependencies
-window.$(OBJ): window.c putty.h win_res.h
-windlg.$(OBJ): windlg.c putty.h ssh.h win_res.h
-terminal.$(OBJ): terminal.c putty.h
-sizetip.$(OBJ): sizetip.c putty.h
-telnet.$(OBJ): telnet.c putty.h
-raw.$(OBJ): raw.c putty.h
-xlat.$(OBJ): xlat.c putty.h
-ldisc.$(OBJ): ldisc.c putty.h
-misc.$(OBJ): misc.c putty.h
-noise.$(OBJ): noise.c putty.h ssh.h
-ssh.$(OBJ): ssh.c ssh.h putty.h tree234.h
-sshcrc.$(OBJ): sshcrc.c ssh.h
-sshdes.$(OBJ): sshdes.c ssh.h
-sshmd5.$(OBJ): sshmd5.c ssh.h
-sshrsa.$(OBJ): sshrsa.c ssh.h
-sshsha.$(OBJ): sshsha.c ssh.h
-sshrand.$(OBJ): sshrand.c ssh.h
-sshblowf.$(OBJ): sshblowf.c ssh.h
-sshdh.$(OBJ): sshdh.c ssh.h
-sshdss.$(OBJ): sshdss.c ssh.h
-sshbn.$(OBJ): sshbn.c ssh.h
-sshpubk.$(OBJ): sshpubk.c ssh.h
-scp.$(OBJ): scp.c putty.h scp.h
-version.$(OBJ): version.c
-be_all.$(OBJ): be_all.c
-be_nossh.$(OBJ): be_nossh.c
-be_none.$(OBJ): be_none.c
-plink.$(OBJ): plink.c putty.h
-pageant.$(OBJ): pageant.c ssh.h tree234.h
-tree234.$(OBJ): tree234.c tree234.h
+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 
+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 
+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 
+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 
+tree234.$(OBJ): tree234.c tree234.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 
 ##--
 
 # Hack to force version.obj to be rebuilt always
-version.obj: versionpseudotarget
-	@echo (built version.obj)
-versionpseudotarget:
+version.obj: *.c *.h *.rc
 	cl $(FWHACK) $(VER) $(CFLAGS) /c version.c
 
 ##-- dependencies
@@ -227,12 +327,6 @@ win_res.$(RES):
 	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
 
 ##-- dependencies
-nosshres.$(RES): nosshres.rc win_res.rc win_res.h putty.ico
-##--
-nosshres.$(RES):
-	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 nosshres.rc
-
-##-- dependencies
 scp.$(RES): scp.rc scp.ico
 ##--
 scp.$(RES):
@@ -244,17 +338,28 @@ pageant.$(RES): pageant.rc pageant.ico pageants.ico
 pageant.$(RES):
 	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 pageant.rc
 
-clean:
-	del *.obj
-	del *.exe
-	del *.res
-	del *.pch
-	del *.aps
-	del *.ilk
-	del *.pdb
-	del *.rsp
-	del *.dsp
-	del *.dsw
-	del *.ncb
-	del *.opt
-	del *.plg
+##-- dependencies
+puttygen.$(RES): puttygen.rc puttygen.ico
+##--
+puttygen.$(RES):
+	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 puttygen.rc
+
+clean: tidy
+	-del *.exe
+
+tidy:
+	-del *.obj
+	-del *.res
+	-del *.pch
+	-del *.aps
+	-del *.ilk
+	-del *.pdb
+	-del *.rsp
+	-del *.dsp
+	-del *.dsw
+	-del *.ncb
+	-del *.opt
+	-del *.plg
+	-del *.map
+	-del *.idb
+	-del debug.log