nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

FWHACK has been dead for years. Remove it from the Makefiles.

Browse Source 
[originally from svn r5113]
This commit is contained in:
Ben Harris 2005-01-15 18:30:05 +00:00
parent 97c851e77f
commit 6b1afc2a68
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Recipe
View File

@ -32,9 +32,6 @@
# #
# Extra options you can set: # Extra options you can set:
# #
# - FWHACK=/DFWHACK
# Enables a hack that tunnels through some firewall proxies.
#
# - VER=/DSNAPSHOT=1999-01-25 # - VER=/DSNAPSHOT=1999-01-25
# Generates executables whose About box report them as being a # Generates executables whose About box report them as being a
# development snapshot. # development snapshot.
@ -115,25 +112,25 @@
# Hack to force version.o to be rebuilt always. # Hack to force version.o to be rebuilt always.
!begin vc !begin vc
version.obj: *.c *.h *.rc version.obj: *.c *.h *.rc
cl $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c cl $(VER) $(CFLAGS) /c ..\version.c
!end !end
!specialobj vc version !specialobj vc version
!begin cygwin !begin cygwin
version.o: FORCE version.o: FORCE
FORCE: FORCE:
$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c
!end !end
!specialobj cygwin version !specialobj cygwin version
!begin borland !begin borland
version.obj: FORCE version.obj: FORCE
FORCE: FORCE:
bcc32 $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c bcc32 $(VER) $(CFLAGS) /c ..\version.c
!end !end
!specialobj borland version !specialobj borland version
!begin lcc !begin lcc
version.o: FORCE version.o: FORCE
FORCE: FORCE:
lcc $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c lcc $(VER) $(CFLAGS) /c ..\version.c
!end !end
!specialobj lcc version !specialobj lcc version
# For Unix, we also need the gross MD5 hack that causes automatic # For Unix, we also need the gross MD5 hack that causes automatic
@ -142,9 +139,9 @@ FORCE:
version.o: FORCE; version.o: FORCE;
FORCE: FORCE:
if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \ if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \
$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \ $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
else \ else \
$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \ $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
fi fi
!end !end
!specialobj gtk version !specialobj gtk version

18
mkfiles.pl
View File

@ -398,9 +398,9 @@ if (defined $makefiles{'cygwin'}) {
print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
"\n"; "\n";
if ($d->{obj} =~ /\.res\.o$/) { if ($d->{obj} =~ /\.res\.o$/) {
print "\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n"; print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n";
} else { } else {
print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c ".$d->{deps}->[0]."\n\n"; print "\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c ".$d->{deps}->[0]."\n\n";
} }
} }
print "\n"; print "\n";
@ -451,12 +451,12 @@ if (defined $makefiles{'borland'}) {
"!endif\n". "!endif\n".
"\n". "\n".
".c.obj:\n". ".c.obj:\n".
&splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT) \$(FWHACK)". &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)".
" \$(XFLAGS) \$(CFLAGS) ". " \$(XFLAGS) \$(CFLAGS) ".
(join " ", map {"-I$dirpfx$_"} @srcdirs) . (join " ", map {"-I$dirpfx$_"} @srcdirs) .
" /c \$*.c",69)."\n". " /c \$*.c",69)."\n".
".rc.res:\n". ".rc.res:\n".
&splitline("\tbrcc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include -r". &splitline("\tbrcc32 \$(RCFL) -i \$(BCB)\\include -r".
" -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401 \$*.rc",69)."\n". " -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401 \$*.rc",69)."\n".
"\n"; "\n";
print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC")); print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC"));
@ -570,9 +570,9 @@ if (defined $makefiles{'vc'}) {
print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
"\n"; "\n";
if ($d->{obj} =~ /.obj$/) { if ($d->{obj} =~ /.obj$/) {
print "\tcl \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) /c ".$d->{deps}->[0],"\n\n"; print "\tcl \$(COMPAT) \$(XFLAGS) \$(CFLAGS) /c ".$d->{deps}->[0],"\n\n";
} else { } else {
print "\trc \$(FWHACK) \$(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 ".$d->{deps}->[0],"\n\n"; print "\trc \$(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 ".$d->{deps}->[0],"\n\n";
} }
} }
print "\n"; print "\n";
@ -910,7 +910,7 @@ if (defined $makefiles{'gtk'}) {
foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) { foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) {
print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
"\n"; "\n";
print &splitline("\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n"); print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n");
} }
print "\n"; print "\n";
print $makefile_extra{'gtk'}; print $makefile_extra{'gtk'};
@ -1101,10 +1101,10 @@ if (defined $makefiles{'lcc'}) {
print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
"\n"; "\n";
if ($d->{obj} =~ /\.obj$/) { if ($d->{obj} =~ /\.obj$/) {
print &splitline("\tlcc -O -p6 \$(COMPAT) \$(FWHACK)". print &splitline("\tlcc -O -p6 \$(COMPAT)".
" \$(XFLAGS) \$(CFLAGS) ".$d->{deps}->[0],69)."\n"; " \$(XFLAGS) \$(CFLAGS) ".$d->{deps}->[0],69)."\n";
} else { } else {
print &splitline("\tlrc \$(FWHACK) \$(RCFL) -r ".$d->{deps}->[0],69)."\n"; print &splitline("\tlrc \$(RCFL) -r ".$d->{deps}->[0],69)."\n";
} }
} }
print "\n"; print "\n";