X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/4017be6d5375063f59b63474490ac072e7f09b1a..d5859615f641e5bbd853cd42aafd4fa577da17eb:/Makefile

diff --git a/Makefile b/Makefile
index 3b134914..7d927203 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,15 @@
 #  - 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>.
+#
+#  - COMPAT=/DWINSOCK_TWO
+#      Causes the PuTTY utilities to include <winsock2.h> instead of
+#      <winsock.h>, except Plink which _needs_ WinSock 2 so it already
+#      does this.
+#
 #  - RCFL=/DASCIICTLS
 #      Uses ASCII rather than Unicode to specify the tab control in
 #      the resource file. Probably most useful when compiling with
@@ -50,23 +59,28 @@ GOBJS2 = xlat.$(OBJ) sizetip.$(OBJ)
 ##-- objects putty puttytel plink
 LOBJS1 = telnet.$(OBJ) raw.$(OBJ) ldisc.$(OBJ)
 ##-- objects putty plink
-POBJS = ssh.$(OBJ) be_all.$(OBJ)
+POBJS = be_all.$(OBJ)
 ##-- objects puttytel
 TOBJS = be_nossh.$(OBJ)
 ##-- objects plink
 PLOBJS = plink.$(OBJ) windlg.$(OBJ)
 ##-- objects pscp
-SOBJS = scp.$(OBJ) windlg.$(OBJ) ssh.$(OBJ) be_none.$(OBJ)
+SOBJS = scp.$(OBJ) windlg.$(OBJ) be_none.$(OBJ)
 ##-- objects putty puttytel pscp plink
-MOBJS = misc.$(OBJ) version.$(OBJ)
+MOBJS = misc.$(OBJ) version.$(OBJ) winstore.$(OBJ)
 ##-- objects putty pscp 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)
+OBJS3 = sshbn.$(OBJ) sshpubk.$(OBJ) ssh.$(OBJ) pageantc.$(OBJ) tree234.$(OBJ)
+##-- objects pageant
+PAGE1 = pageant.$(OBJ) sshrsa.$(OBJ) sshpubk.$(OBJ) sshdes.$(OBJ) sshbn.$(OBJ)
+PAGE2 = sshmd5.$(OBJ) version.$(OBJ) tree234.$(OBJ)
 ##-- resources putty
 PRESRC = win_res.$(RES)
 ##-- resources puttytel
 TRESRC = nosshres.$(RES)
+##-- resources pageant
+PAGERC = pageant.$(RES)
 ##-- resources pscp
 SRESRC = scp.$(RES)
 ##-- resources plink
@@ -76,16 +90,19 @@ LRESRC = plink.$(RES)
 ##-- gui-apps
 # putty
 # puttytel
+# pageant
 ##-- console-apps
 # pscp
+# plink
 ##--
 
 LIBS1 = advapi32.lib user32.lib gdi32.lib
 LIBS2 = comctl32.lib comdlg32.lib
+LIBS3 = shell32.lib
 SOCK1 = wsock32.lib
 SOCK2 = ws2_32.lib
 
-all: putty.exe puttytel.exe pscp.exe plink.exe
+all: putty.exe puttytel.exe pscp.exe plink.exe pageant.exe
 
 putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(PRESRC) putty.rsp
 	link $(LFLAGS) -out:putty.exe @putty.rsp
@@ -93,6 +110,9 @@ putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(O
 puttytel.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(TOBJS) $(MOBJS) $(TRESRC) puttytel.rsp
 	link $(LFLAGS) -out:puttytel.exe @puttytel.rsp
 
+pageant.exe: $(PAGE1) $(PAGE2) $(PAGERC) pageant.rsp
+	link $(LFLAGS) -out:pageant.exe @pageant.rsp
+
 pscp.exe: $(SOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(SRESRC) pscp.rsp
 	link $(LFLAGS) -out:pscp.exe @pscp.rsp
 
@@ -126,6 +146,15 @@ puttytel.rsp: makefile
 	echo $(LIBS2) >> 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 $(LIBS1) >> pageant.rsp
+	echo $(LIBS2) >> pageant.rsp
+	echo $(LIBS3) >> pageant.rsp
+
 pscp.rsp: makefile
 	echo /nologo /subsystem:console > pscp.rsp
 	echo $(SOBJS) >> pscp.rsp
@@ -153,8 +182,9 @@ plink.rsp: makefile
  	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
+window.$(OBJ): window.c putty.h win_res.h storage.h
+windlg.$(OBJ): windlg.c putty.h ssh.h win_res.h storage.h
+winstore.$(OBJ): winstore.c putty.h storage.h
 terminal.$(OBJ): terminal.c putty.h
 sizetip.$(OBJ): sizetip.c putty.h
 telnet.$(OBJ): telnet.c putty.h
@@ -162,8 +192,8 @@ 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
+noise.$(OBJ): noise.c putty.h ssh.h storage.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
@@ -175,12 +205,14 @@ 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
+scp.$(OBJ): scp.c putty.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
 ##--
 
 # Hack to force version.obj to be rebuilt always
@@ -207,6 +239,12 @@ scp.$(RES): scp.rc scp.ico
 scp.$(RES):
 	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 scp.rc
 
+##-- dependencies
+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
@@ -216,3 +254,8 @@ clean:
 	del *.ilk
 	del *.pdb
 	del *.rsp
+	del *.dsp
+	del *.dsw
+	del *.ncb
+	del *.opt
+	del *.plg