projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorganise setup_fonts_ucs so that in case of error it does nothing
[u/mdw/putty]
/
mkfiles.pl
diff --git
a/mkfiles.pl
b/mkfiles.pl
index
c87ae4e
..
fd543eb
100755
(executable)
--- a/
mkfiles.pl
+++ b/
mkfiles.pl
@@
-433,7
+433,7
@@
if (defined $makefiles{'cygwin'}) {
##-- CygWin makefile
open OUT, ">$makefiles{'cygwin'}"; select OUT;
print
##-- CygWin makefile
open OUT, ">$makefiles{'cygwin'}"; select OUT;
print
- "# Makefile for $project_name under
cygwin
.\n".
+ "# Makefile for $project_name under
Cygwin, MinGW, or Winelib
.\n".
"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# gcc command line option is -D not /D
"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# gcc command line option is -D not /D
@@
-453,7
+453,7
@@
if (defined $makefiles{'cygwin'}) {
"# RCINC = --include-dir c:\\cygwin\\include\\\n".
"\n".
&splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
"# RCINC = --include-dir c:\\cygwin\\include\\\n".
"\n".
&splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
- " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP " .
+ " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP
-DNO_SECUREZEROMEMORY
" .
(join " ", map {"-I$dirpfx$_"} @srcdirs)) .
"\n".
"LDFLAGS = -mno-cygwin -s\n".
(join " ", map {"-I$dirpfx$_"} @srcdirs)) .
"\n".
"LDFLAGS = -mno-cygwin -s\n".
@@
-1155,7
+1155,10
@@
if (defined $makefiles{'am'}) {
$objtosrc{$d->{obj}} = $d->{deps}->[0];
}
$objtosrc{$d->{obj}} = $d->{deps}->[0];
}
- @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)", map {"-I$dirpfx$_"} @srcdirs);
+ print &splitline(join " ", "AM_CPPFLAGS", "=",
+ map {"-I$dirpfx$_"} @srcdirs), "\n";
+
+ @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)");
print "if HAVE_GTK\n";
print &splitline(join " ", "AM_CFLAGS", "=",
"\$(GTK_CFLAGS)", @amcflags), "\n";
print "if HAVE_GTK\n";
print &splitline(join " ", "AM_CFLAGS", "=",
"\$(GTK_CFLAGS)", @amcflags), "\n";