# <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.
#
##--
-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) $(XFLAGS) $(CFLAGS) /c $*.c
##-- objects putty puttytel
GOBJS1 = window.$(OBJ) windlg.$(OBJ) winctrls.$(OBJ) terminal.$(OBJ)
-GOBJS2 = xlat.$(OBJ) sizetip.$(OBJ)
+GOBJS2 = sizetip.$(OBJ) wcwidth.$(OBJ) unicode.$(OBJ)
##-- objects putty puttytel plink
LOBJS1 = telnet.$(OBJ) raw.$(OBJ) rlogin.$(OBJ) ldisc.$(OBJ) winnet.$(OBJ)
##-- objects putty plink
##-- objects pscp
SOBJS = scp.$(OBJ) winnet.$(OBJ) be_none.$(OBJ)
##-- objects psftp
-FOBJS = psftp.$(OBJ) sftp.$(OBJ) int64.$(OBJ) winnet.$(OBJ) be_none.$(OBJ)
+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)
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) sshaes.$(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) misc.$(OBJ) sshaes.$(OBJ)
-PAGE3 = sshsha.$(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)
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
puttygen.exe: $(GEN1) $(GEN2) $(GEN3) $(GEN4) $(GENRC) puttygen.rsp
link $(LFLAGS) -out:puttygen.exe -map:puttygen.map @puttygen.rsp
-pscp.exe: $(SOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) pscp.rsp
+pscp.exe: $(SOBJS) $(SFOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) pscp.rsp
link $(LFLAGS) -out:pscp.exe -map:pscp.map @pscp.rsp
-psftp.exe: $(FOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) psftp.rsp
+psftp.exe: $(FOBJS) $(SFOBJS) $(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
link $(LFLAGS) -out:plink.exe -map:plink.map @plink.rsp
+ssh.obj:
+ cl $(FWHACK) $(VER) $(CFLAGS) /Gi- /c ssh.c
+
putty.rsp: makefile
echo /nologo /subsystem:windows > putty.rsp
echo $(GOBJS1) >> 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
echo $(PRESRC) >> puttytel.rsp
echo $(LIBS1) >> puttytel.rsp
echo $(LIBS2) >> puttytel.rsp
+ echo $(LIBS3) >> puttytel.rsp
echo $(SOCK1) >> puttytel.rsp
pageant.rsp: makefile
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
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 $(SOCK2) >> plink.rsp
##-- dependencies
-window.$(OBJ): window.c putty.h puttymem.h network.h win_res.h storage.h winstuff.h
-windlg.$(OBJ): windlg.c putty.h puttymem.h network.h ssh.h win_res.h winstuff.h
-winctrls.$(OBJ): winctrls.c winstuff.h winstuff.h
-settings.$(OBJ): settings.c putty.h puttymem.h network.h storage.h
-winstore.$(OBJ): winstore.c putty.h puttymem.h network.h storage.h
-terminal.$(OBJ): terminal.c putty.h puttymem.h network.h
-sizetip.$(OBJ): sizetip.c putty.h puttymem.h network.h winstuff.h
-telnet.$(OBJ): telnet.c putty.h puttymem.h network.h
-raw.$(OBJ): raw.c putty.h puttymem.h network.h
-rlogin.$(OBJ): rlogin.c putty.h puttymem.h network.h
-xlat.$(OBJ): xlat.c putty.h puttymem.h network.h
-ldisc.$(OBJ): ldisc.c putty.h puttymem.h network.h
-misc.$(OBJ): misc.c putty.h puttymem.h network.h
-noise.$(OBJ): noise.c putty.h puttymem.h network.h ssh.h storage.h
-ssh.$(OBJ): ssh.c ssh.h putty.h puttymem.h network.h tree234.h
-sshcrc.$(OBJ): sshcrc.c ssh.h puttymem.h
-sshdes.$(OBJ): sshdes.c ssh.h puttymem.h
-sshaes.$(OBJ): sshaes.c ssh.h puttymem.h
-sshmd5.$(OBJ): sshmd5.c ssh.h puttymem.h
-sshrsa.$(OBJ): sshrsa.c ssh.h puttymem.h
-sshsha.$(OBJ): sshsha.c ssh.h puttymem.h
-sshrand.$(OBJ): sshrand.c ssh.h puttymem.h
-sshblowf.$(OBJ): sshblowf.c ssh.h puttymem.h
-sshdh.$(OBJ): sshdh.c ssh.h puttymem.h
-sshdss.$(OBJ): sshdss.c ssh.h puttymem.h
-sshbn.$(OBJ): sshbn.c ssh.h puttymem.h
-sshpubk.$(OBJ): sshpubk.c ssh.h puttymem.h
-sshzlib.$(OBJ): sshzlib.c ssh.h puttymem.h
-scp.$(OBJ): scp.c putty.h puttymem.h network.h winstuff.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 puttymem.h network.h winstuff.h
-pageant.$(OBJ): pageant.c ssh.h puttymem.h tree234.h
-pageantc.$(OBJ): pageantc.c puttymem.h
-tree234.$(OBJ): tree234.c tree234.h puttymem.h
-puttygen.$(OBJ): puttygen.c putty.h ssh.h winstuff.h
-psftp.$(OBJ): psftp.c putty.h ssh.h storage.h sftp.h int64.h
-sftp.$(OBJ): sftp.c sftp.h int64.h
-int64.$(OBJ): int64.c int64.h
-x11fwd.$(OBJ): x11fwd.c putty.h network.h puttymem.h ssh.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
rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 puttygen.rc
clean: tidy
- del *.exe
+ -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 *.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
projects / u / mdw / putty / blobdiff