Remove -DNO_SECURITY from the cygwin build, since <aclapi.h> has been

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index f2c660b..dfb025c 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -9,7 +9,13 @@
 
 use FileHandle;
 
-open IN, "Recipe" or die "unable to open Recipe file\n";
+open IN, "Recipe" or do {
+    # We want to deal correctly with being run from one of the
+    # subdirs in the source tree. So if we can't find Recipe here,
+    # try one level up.
+    chdir "..";
+    open IN, "Recipe" or die "unable to open Recipe file\n";
+};
 
 # HACK: One of the source files in `charset' is auto-generated by
 # sbcsgen.pl. We need to generate that _now_, before attempting
@@ -305,7 +311,7 @@ print
 "# RCINC = --include-dir c:\\cygwin\\include\\\n".
 "\n".
 &splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
-  " -DNO_SECURITY -D_NO_OLDNAMES -DNO_MULTIMON -I.")."\n".
+  " -D_NO_OLDNAMES -DNO_MULTIMON -I.")."\n".
 "LDFLAGS = -mno-cygwin -s\n".
 &splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1".
   " --define WINVER=0x0400 --define MINGW32_FIX=1")."\n".
@@ -539,7 +545,7 @@ print
 "# TOOLPATH = /opt/gcc/bin\n".
 "CC = \$(TOOLPATH)cc\n".
 "\n".
-&splitline("CFLAGS = -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
+&splitline("CFLAGS = -O2 -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
 "XLDFLAGS = `gtk-config --libs`\n".
 "ULDFLAGS =#\n".
 "INSTALL=install\n",