X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Makefile;h=4a080c60d55a2f8098ad1dcd247819e2ac77d3c7;hb=fffd4563e6931c67c09cba79e3df6cd2400cb7a5;hp=86611beee1202573362e240e4d6bd41dc8cbb744;hpb=c74130d423fd83a65c51b7634e3c34aaf557ae68;p=PuTTY.git

diff --git a/Makefile b/Makefile
index 86611bee..4a080c60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,32 @@
 # Makefile for PuTTY. Use `FWHACK=/DFWHACK' to cause the firewall hack
 # to be built in. (requires rebuild of ssh.obj only)
 
-CFLAGS = /nologo /W3 /YX /O2 /Yd /D_X86_ /D_WINDOWS /DDEBUG /ML /Fd
+# Can also build with `VER=/DSNAPSHOT=1999-01-25' or
+# `VER=/DRELEASE=0.43' to get version numbering; otherwise you'll
+# get `Unidentified build'.
+
+CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /ML /Fd
 
 .c.obj:
 	cl $(FWHACK) $(CFLAGS) /c $*.c
 
-OBJS1 = window.obj windlg.obj terminal.obj telnet.obj misc.obj noise.obj
+PUTTYOBJS = window.obj windlg.obj terminal.obj telnet.obj
+OBJS1 = misc.obj noise.obj
 OBJS2 = ssh.obj sshcrc.obj sshdes.obj sshmd5.obj sshrsa.obj sshrand.obj
-OBJS3 = sshsha.obj
+OBJS3 = sshsha.obj sshblowf.obj version.obj
 RESRC = win_res.res
 LIBS1 = advapi32.lib user32.lib gdi32.lib
 LIBS2 = wsock32.lib comctl32.lib comdlg32.lib
 
-putty.exe: $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
+putty.exe: $(PUTTYOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
 	link /debug -out:putty.exe @link.rsp
 
-puttyd.exe: $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
+puttyd.exe: $(PUTTYOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
 	link /debug -out:puttyd.exe @link.rsp
 
 link.rsp: makefile
 	echo /nologo /subsystem:windows > link.rsp
+	echo $(PUTTYOBJS) >> link.rsp
 	echo $(OBJS1) >> link.rsp
 	echo $(OBJS2) >> link.rsp
 	echo $(OBJS3) >> link.rsp
@@ -41,9 +47,16 @@ 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
+version.obj: versionpseudotarget
+	@echo (built version.obj)
+
+# Hack to force version.obj to be rebuilt always
+versionpseudotarget:
+	cl $(FWHACK) $(VER) $(CFLAGS) /c version.c
 
 win_res.res: win_res.rc win_res.h putty.ico
-	rc $(FWHACK) -r win_res.rc
+	rc $(FWHACK) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
 
 clean:
 	del *.obj
@@ -53,4 +66,4 @@ clean:
 	del *.aps
 	del *.ilk
 	del *.pdb
-	del link.rsp
+	del *.rsp