X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Makefile;h=00157caaba2754ef08585dc65b9f45e0573950fd;hb=396d6cd422c34293794cbd7083a2053268e95302;hp=55535e5490400aaaf36b7d486442336887a3bdcb;hpb=b857fd06cc0bcde6b9aeca6b659d16a75eabcba8;p=PuTTY.git

diff --git a/Makefile b/Makefile
index 55535e54..00157caa 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,19 @@
 # `VER=/DRELEASE=0.43' to get version numbering; otherwise you'll
 # get `Unidentified build'.
 
+# COMPAT=/DWIN32S_COMPAT will produce a binary that works (minimally)
+# with Win32s
+
 CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /ML /Fd
 
 .c.obj:
-	cl $(FWHACK) $(CFLAGS) /c $*.c
+	cl $(COMPAT) $(FWHACK) $(CFLAGS) /c $*.c
 
-PUTTYOBJS = window.obj windlg.obj terminal.obj telnet.obj
+POBJS1 = window.obj windlg.obj terminal.obj telnet.obj raw.obj
+POBJS2 = xlat.obj ldisc.obj
 OBJS1 = misc.obj noise.obj
 OBJS2 = ssh.obj sshcrc.obj sshdes.obj sshmd5.obj sshrsa.obj sshrand.obj
-OBJS3 = sshsha.obj sshblowf.obj version.obj
+OBJS3 = sshsha.obj sshblowf.obj version.obj sizetip.obj
 RESRC = win_res.res
 LIBS1 = advapi32.lib user32.lib gdi32.lib
 LIBS2 = wsock32.lib comctl32.lib comdlg32.lib
@@ -23,15 +27,16 @@ SCPOBJS3 = sshrsa.obj sshrand.obj sshsha.obj sshblowf.obj version.obj
 
 all: putty.exe pscp.exe
 
-putty.exe: $(PUTTYOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
+putty.exe: $(POBJS1) $(POBJS2) $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
 	link /debug -out:putty.exe @link.rsp
 
-puttyd.exe: $(PUTTYOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
+puttyd.exe: $(POBJS1) $(POBJS2) $(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 $(POBJS1) >> link.rsp
+	echo $(POBJS2) >> link.rsp
 	echo $(OBJS1) >> link.rsp
 	echo $(OBJS2) >> link.rsp
 	echo $(OBJS3) >> link.rsp
@@ -42,7 +47,11 @@ link.rsp: makefile
 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
@@ -71,9 +80,9 @@ scp.rsp: makefile
 	echo $(SCPOBJS) >> scp.rsp
 	echo $(SCPOBJS2) >> scp.rsp
 	echo $(SCPOBJS3) >> scp.rsp
-	echo scp.res >> link.rsp
-	echo $(LIBS1) >> link.rsp
-	echo $(LIBS2) >> link.rsp
+	echo scp.res >> scp.rsp
+	echo $(LIBS1) >> scp.rsp
+	echo $(LIBS2) >> scp.rsp
 
 scp.obj: scp.c putty.h scp.h
 scpssh.obj: scpssh.c putty.h ssh.h scp.h