X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/76d3a838799e8abde2e7ac41fc59ef8785c29a6f..b89e7e07d274c272d37c2e2e68e73d3ffec6d5c4:/mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 8905c3fc..478b5d52 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -12,6 +12,8 @@
 #    are hardwired, and also the libraries are fixed. This is
 #    mainly because I was too scared to go anywhere near it.
 #  - sbcsgen.pl is still run at startup.
+#
+# FIXME: no attempt made to handle !forceobj in the project files.
 
 use FileHandle;
 use Cwd;
@@ -52,6 +54,7 @@ while (<IN>) {
   if ($_[0] eq "!srcdir") { push @srcdirs, $_[1]; next; }
   if ($_[0] eq "!makefile" and &mfval($_[1])) { $makefiles{$_[1]}=$_[2]; next;}
   if ($_[0] eq "!specialobj" and &mfval($_[1])) { $specialobj{$_[1]}->{$_[2]} = 1; next;}
+  if ($_[0] eq "!forceobj") { $forceobj{$_[1]} = 1; next; }
   if ($_[0] eq "!begin") {
       if (&mfval($_[1])) {
           $sect = $_[2] ? $_[2] : "end";
@@ -212,7 +215,8 @@ sub mfval($) {
     # Returns true if the argument is a known makefile type. Otherwise,
     # prints a warning and returns false;
     if (grep { $type eq $_ }
-	("vc","vcproj","cygwin","borland","lcc","gtk","ac","mpw","osx")) {
+	("vc","vcproj","cygwin","borland","lcc","devcppproj","gtk","unix",
+	 "ac","mpw","osx",)) {
 	    return 1;
 	}
     warn "$.:unknown makefile type '$type'\n";
@@ -296,7 +300,8 @@ sub splitline {
   $splitchar = (defined $splitchar ? $splitchar : '\\');
   while (length $line > $len) {
     $line =~ /^(.{0,$len})\s(.*)$/ or $line =~ /^(.{$len,}?\s(.*)$/;
-    $result .= $1 . " ${splitchar}\n\t\t";
+    $result .= $1;
+    $result .= " ${splitchar}\n\t\t" if $2 ne '';
     $line = $2;
     $len = 60;
   }
@@ -324,7 +329,7 @@ sub deps {
       s/\//$dirsep/g;
       $_ = $prefix . $_;
     } @deps;
-    push @ret, {obj => $x, deps => [@deps]};
+    push @ret, {obj => $x, obj_orig => $i, deps => [@deps]};
   }
   return @ret;
 }
@@ -375,7 +380,7 @@ if (defined $makefiles{'cygwin'}) {
     "#\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
-    ($_ = $help) =~ s/=\/D/=-D/gs;
+    ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
     print $_;
     print
     "\n".
@@ -391,7 +396,7 @@ if (defined $makefiles{'cygwin'}) {
     "# RCINC = --include-dir c:\\cygwin\\include\\\n".
     "\n".
     &splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
-      " -D_NO_OLDNAMES -DNO_MULTIMON " .
+      " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP " .
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs)) .
 	       "\n".
     "LDFLAGS = -mno-cygwin -s\n".
@@ -415,19 +420,24 @@ if (defined $makefiles{'cygwin'}) {
                        $objstr . " $libstr", 69), "\n\n";
     }
     foreach $d (&deps("X.o", "X.res.o", $dirpfx, "/", "cygwin")) {
-      print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
-        "\n";
+      if ($forceobj{$d->{obj_orig}}) {
+        printf ("%s: FORCE\n", $d->{obj});
+      } else {
+        print &splitline(sprintf("%s: %s", $d->{obj},
+                         join " ", @{$d->{deps}})), "\n";
+      }
       if ($d->{obj} =~ /\.res\.o$/) {
 	  print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n";
       } else {
-	  print "\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c ".$d->{deps}->[0]."\n\n";
+	  print "\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c ".$d->{deps}->[0]."\n\n";
       }
     }
     print "\n";
     print $makefile_extra{'cygwin'}->{'end'};
     print "\nclean:\n".
     "\trm -f *.o *.exe *.res.o *.map\n".
-    "\n";
+    "\n".
+    "FORCE:\n";
     select STDOUT; close OUT;
 
 }
@@ -454,7 +464,7 @@ if (defined $makefiles{'borland'}) {
     "#\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";
     # bcc32 command line option is -D not /D
-    ($_ = $help) =~ s/=\/D/=-D/gs;
+    ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
     print $_;
     print
     "\n".
@@ -463,7 +473,9 @@ if (defined $makefiles{'borland'}) {
     "MAKEFILE = Makefile.bor\n".
     "\n".
     "# C compilation flags\n".
-    "CFLAGS = -D_WINDOWS -DWINVER=0x0401\n".
+    "CFLAGS = -D_WINDOWS -DWINVER=0x0500\n".
+    "# Resource compilation flags\n".
+    "RCFLAGS = -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401\n".
     "\n".
     "# Get include directory for resource compiler\n".
     "!if !\$d(BCB)\n".
@@ -474,12 +486,12 @@ if (defined $makefiles{'borland'}) {
     "\n".
     ".c.obj:\n".
     &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)".
-	       " \$(XFLAGS) \$(CFLAGS) ".
+	       " \$(CFLAGS) \$(XFLAGS) ".
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
 	       " /c \$*.c",69)."\n".
     ".rc.res:\n".
     &splitline("\tbrcc32 \$(RCFL) -i \$(BCB)\\include -r".
-      " -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401 \$*.rc",69)."\n".
+      " \$(RCFLAGS) \$*.rc",69)."\n".
     "\n";
     print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C"));
     print "\n\n";
@@ -519,8 +531,12 @@ if (defined $makefiles{'borland'}) {
       print "\n";
     }
     foreach $d (&deps("X.obj", "X.res", $dirpfx, "\\", "borland")) {
-      print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
-        "\n";
+      if ($forceobj{$d->{obj_orig}}) {
+        printf("%s: FORCE\n", $d->{obj});
+      } else {
+        print &splitline(sprintf("%s: %s", $d->{obj},
+                                 join " ", @{$d->{deps}})), "\n";
+      }
     }
     print "\n";
     print $makefile_extra{'borland'}->{'end'};
@@ -534,7 +550,10 @@ if (defined $makefiles{'borland'}) {
     "\t-del *.pdb\n".
     "\t-del *.rsp\n".
     "\t-del *.tds\n".
-    "\t-del *.\$\$\$\$\$\$\n";
+    "\t-del *.\$\$\$\$\$\$\n".
+    "\n".
+    "FORCE:\n".
+    "\t-rem dummy command\n";
     select STDOUT; close OUT;
 }
 
@@ -557,8 +576,9 @@ if (defined $makefiles{'vc'}) {
       "# C compilation flags\n".
       "CFLAGS = /nologo /W3 /O1 " .
       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
-      " /D_WINDOWS /D_WIN32_WINDOWS=0x401 /DWINVER=0x401\n".
+      " /D_WINDOWS /D_WIN32_WINDOWS=0x500 /DWINVER=0x500\n".
       "LFLAGS = /incremental:no /fixed\n".
+      "RCFLAGS = -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
       "\n".
       $makefile_extra{'vc'}->{'vars'} .
       "\n".
@@ -591,12 +611,13 @@ if (defined $makefiles{'vc'}) {
 	print "\n";
     }
     foreach $d (&deps("X.obj", "X.res", $dirpfx, "\\", "vc")) {
-	print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
-	  "\n";
+        $extradeps = $forceobj{$d->{obj_orig}} ? ["*.c","*.h","*.rc"] : [];
+        print &splitline(sprintf("%s: %s", $d->{obj},
+                                 join " ", @$extradeps, @{$d->{deps}})), "\n";
         if ($d->{obj} =~ /.obj$/) {
-	    print "\tcl \$(COMPAT) \$(XFLAGS) \$(CFLAGS) /c ".$d->{deps}->[0],"\n\n";
+	    print "\tcl \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c ".$d->{deps}->[0],"\n\n";
 	} else {
-	    print "\trc \$(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 ".$d->{deps}->[0],"\n\n";
+	    print "\trc \$(RCFL) -r \$(RCFLAGS) ".$d->{deps}->[0],"\n\n";
 	}
     }
     print "\n";
@@ -646,7 +667,7 @@ if (defined $makefiles{'vcproj'}) {
     # Get names of all Windows projects (GUI and console)
     my @prognames = &prognames("G:C");
     foreach $progname (@prognames) {
-    	create_project(\%all_object_deps, $progname);
+      create_vc_project(\%all_object_deps, $progname);
     }
     # Create the workspace file
     open OUT, ">$project_name.dsw"; binmode OUT; select OUT;
@@ -688,7 +709,7 @@ if (defined $makefiles{'vcproj'}) {
     select STDOUT; close OUT;
     chdir $orig_dir;
 
-    sub create_project {
+    sub create_vc_project {
     	my ($all_object_deps, $progname) = @_;
     	# Construct program's dependency info
     	%seen_objects = ();
@@ -896,27 +917,45 @@ if (defined $makefiles{'gtk'}) {
     "#\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
-    ($_ = $help) =~ s/=\/D/=-D/gs;
+    ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
     print $_;
     print
     "\n".
     "# You can define this path to point at your tools if you need to\n".
     "# TOOLPATH = /opt/gcc/bin\n".
     "CC = \$(TOOLPATH)cc\n".
+    "# If necessary set the path to krb5-config here\n".
+    "KRB5CONFIG=krb5-config\n".
+    "# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'\n".
+    "# (depending on what works on your system) if you want to enforce\n".
+    "# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'\n".
+    "# if you want to enforce 2.0. The default is to try 2.0 and fall back\n".
+    "# to 1.2 if it isn't found.\n".
+    "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 \$\$0 2>/dev/null || gtk-config \$\$0'\n".
+    "\n".
+    "-include Makefile.local\n".
+    "\n".
+    "unexport CFLAGS # work around a weird issue with krb5-config\n".
     "\n".
     &splitline("CFLAGS = -O2 -Wall -Werror -g " .
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
-	       " `gtk-config --cflags`")."\n".
-    "XLDFLAGS = `gtk-config --libs`\n".
-    "ULDFLAGS =#\n".
-    "INSTALL=install\n",
-    "INSTALL_PROGRAM=\$(INSTALL)\n",
-    "INSTALL_DATA=\$(INSTALL)\n",
-    "prefix=/usr/local\n",
-    "exec_prefix=\$(prefix)\n",
-    "bindir=\$(exec_prefix)/bin\n",
-    "mandir=\$(prefix)/man\n",
-    "man1dir=\$(mandir)/man1\n",
+	       " \$(shell \$(GTK_CONFIG) --cflags)").
+		 " -D _FILE_OFFSET_BITS=64\n".
+    "XLDFLAGS = \$(LDFLAGS) \$(shell \$(GTK_CONFIG) --libs)\n".
+    "ULDFLAGS = \$(LDFLAGS)\n".
+    "ifeq (,\$(findstring NO_GSSAPI,\$(COMPAT)))\n".
+    "CFLAGS+= \$(shell \$(KRB5CONFIG) --cflags gssapi)\n".
+    "XLDFLAGS+= \$(shell \$(KRB5CONFIG) --libs gssapi)\n".
+    "ULDFLAGS = \$(shell \$(KRB5CONFIG) --libs gssapi)\n".
+    "endif\n".
+    "INSTALL=install\n".
+    "INSTALL_PROGRAM=\$(INSTALL)\n".
+    "INSTALL_DATA=\$(INSTALL)\n".
+    "prefix=/usr/local\n".
+    "exec_prefix=\$(prefix)\n".
+    "bindir=\$(exec_prefix)/bin\n".
+    "mandir=\$(prefix)/man\n".
+    "man1dir=\$(mandir)/man1\n".
     "\n".
     $makefile_extra{'gtk'}->{'vars'} .
     "\n".
@@ -930,18 +969,96 @@ if (defined $makefiles{'gtk'}) {
       $objstr = &objects($p, "X.o", undef, undef);
       print &splitline($prog . ": " . $objstr), "\n";
       $libstr = &objects($p, undef, undef, "-lX");
-      print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " .
-                       $objstr . " $libstr", 69), "\n\n";
+      print &splitline("\t\$(CC)" . $mw . " -o \$@ " .
+                       $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n";
     }
     foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) {
-      print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
-          "\n";
-      print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n");
+      if ($forceobj{$d->{obj_orig}}) {
+        printf("%s: FORCE\n", $d->{obj});
+      } else {
+        print &splitline(sprintf("%s: %s", $d->{obj},
+                                 join " ", @{$d->{deps}})), "\n";
+      }
+      print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
     }
     print "\n";
     print $makefile_extra{'gtk'}->{'end'};
     print "\nclean:\n".
     "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U")) . "\n";
+    print "\nFORCE:\n";
+    select STDOUT; close OUT;
+}
+
+if (defined $makefiles{'unix'}) {
+    $dirpfx = &dirpfx($makefiles{'unix'}, "/");
+
+    ##-- GTK-free pure-Unix makefile for non-GUI apps only
+    open OUT, ">$makefiles{'unix'}"; select OUT;
+    print
+    "# Makefile for $project_name under Unix.\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
+    ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
+    print $_;
+    print
+    "\n".
+    "# You can define this path to point at your tools if you need to\n".
+    "# TOOLPATH = /opt/gcc/bin\n".
+    "CC = \$(TOOLPATH)cc\n".
+    "# If necessary set the path to krb5-config here\n".
+    "KRB5CONFIG=krb5-config\n".
+    "\n".
+    "-include Makefile.local\n".
+    "\n".
+    "unexport CFLAGS # work around a weird issue with krb5-config\n".
+    "\n".
+    &splitline("CFLAGS = -O2 -Wall -Werror -g " .
+	       (join " ", map {"-I$dirpfx$_"} @srcdirs)).
+		 " -D _FILE_OFFSET_BITS=64\n".
+    "ULDFLAGS = \$(LDFLAGS)\n".
+    "ifeq (,\$(findstring NO_GSSAPI,\$(COMPAT)))\n".
+    "CFLAGS+= \$(shell \$(KRB5CONFIG) --cflags gssapi)\n".
+    "ULDFLAGS = \$(shell \$(KRB5CONFIG) --libs gssapi)\n".
+    "endif\n".
+    "INSTALL=install\n".
+    "INSTALL_PROGRAM=\$(INSTALL)\n".
+    "INSTALL_DATA=\$(INSTALL)\n".
+    "prefix=/usr/local\n".
+    "exec_prefix=\$(prefix)\n".
+    "bindir=\$(exec_prefix)/bin\n".
+    "mandir=\$(prefix)/man\n".
+    "man1dir=\$(mandir)/man1\n".
+    "\n".
+    $makefile_extra{'unix'}->{'vars'} .
+    "\n".
+    ".SUFFIXES:\n".
+    "\n".
+    "\n";
+    print &splitline("all:" . join "", map { " $_" } &progrealnames("U"));
+    print "\n\n";
+    foreach $p (&prognames("U")) {
+      ($prog, $type) = split ",", $p;
+      $objstr = &objects($p, "X.o", undef, undef);
+      print &splitline($prog . ": " . $objstr), "\n";
+      $libstr = &objects($p, undef, undef, "-lX");
+      print &splitline("\t\$(CC)" . $mw . " -o \$@ " .
+                       $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n";
+    }
+    foreach $d (&deps("X.o", undef, $dirpfx, "/", "unix")) {
+      if ($forceobj{$d->{obj_orig}}) {
+        printf("%s: FORCE\n", $d->{obj});
+      } else {
+        print &splitline(sprintf("%s: %s", $d->{obj},
+                                 join " ", @{$d->{deps}})), "\n";
+      }
+      print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
+    }
+    print "\n";
+    print $makefile_extra{'unix'}->{'end'};
+    print "\nclean:\n".
+    "\trm -f *.o". (join "", map { " $_" } &progrealnames("U")) . "\n";
+    print "\nFORCE:\n";
     select STDOUT; close OUT;
 }
 
@@ -955,7 +1072,7 @@ if (defined $makefiles{'ac'}) {
     "#\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
-    ($_ = $help) =~ s/=\/D/=-D/gs;
+    ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
     print $_;
     print
     "\n".
@@ -965,14 +1082,14 @@ if (defined $makefiles{'ac'}) {
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
     "XLDFLAGS = \@LDFLAGS\@ \@LIBS\@ \@GTK_LIBS\@\n".
     "ULDFLAGS = \@LDFLAGS\@ \@LIBS\@\n".
-    "INSTALL=\@INSTALL\@\n",
-    "INSTALL_PROGRAM=\$(INSTALL)\n",
-    "INSTALL_DATA=\$(INSTALL)\n",
-    "prefix=\@prefix\@\n",
-    "exec_prefix=\@exec_prefix\@\n",
-    "bindir=\@bindir\@\n",
-    "mandir=\@mandir\@\n",
-    "man1dir=\$(mandir)/man1\n",
+    "INSTALL=\@INSTALL\@\n".
+    "INSTALL_PROGRAM=\$(INSTALL)\n".
+    "INSTALL_DATA=\$(INSTALL)\n".
+    "prefix=\@prefix\@\n".
+    "exec_prefix=\@exec_prefix\@\n".
+    "bindir=\@bindir\@\n".
+    "mandir=\@mandir\@\n".
+    "man1dir=\$(mandir)/man1\n".
     "\n".
     $makefile_extra{'gtk'}->{'vars'} .
     "\n".
@@ -988,18 +1105,26 @@ if (defined $makefiles{'ac'}) {
       $objstr = &objects($p, "X.o", undef, undef);
       print &splitline($prog . ": " . $objstr), "\n";
       $libstr = &objects($p, undef, undef, "-lX");
-      print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " .
-                       $objstr . " $libstr", 69), "\n\n";
+      print &splitline("\t\$(CC)" . $mw . " -o \$@ " .
+                       $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n";
     }
     foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) {
-      print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
-          "\n";
-      print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n");
+      if ($forceobj{$d->{obj_orig}}) {
+        printf("%s: FORCE\n", $d->{obj});
+      } else {
+        print &splitline(sprintf("%s: %s", $d->{obj},
+                                 join " ", @{$d->{deps}})), "\n";
+      }
+      print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
     }
     print "\n";
     print $makefile_extra{'gtk'}->{'end'};
     print "\nclean:\n".
     "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U")) . "\n";
+    print "\ndistclean: clean\n".
+    "\t". &splitline("rm -f config.status config.cache config.log ".
+		     "configure.lineno config.status.lineno Makefile") . "\n";
+    print "\nFORCE:\n";
     select STDOUT; close OUT;
 }
 
@@ -1010,8 +1135,8 @@ if (defined $makefiles{'mpw'}) {
     "# Makefile for $project_name under MPW.\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";
-    # MPW command line option is -d not /D
-    ($_ = $help) =~ s/=\/D/=-d /gs;
+    # MPW command line option is -d not /D (FIXME further massaging?)
+    ($_ = $help) =~ s/([=" ])\/D/\1-d /gs;
     print $_;
     print "\n\n".
     "ROptions     = `Echo \"{VER}\" | StreamEdit -e \"1,\$ replace /=(\xc5)\xa81\xb0/ 'STR=\xb6\xb6\xb6\xb6\xb6\"' \xa81 '\xb6\xb6\xb6\xb6\xb6\"'\"`".
@@ -1153,7 +1278,7 @@ if (defined $makefiles{'lcc'}) {
     "#\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";
     # lcc command line option is -D not /D
-    ($_ = $help) =~ s/=\/D/=-D/gs;
+    ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
     print $_;
     print
     "\n".
@@ -1165,6 +1290,8 @@ if (defined $makefiles{'lcc'}) {
     "CFLAGS = -D_WINDOWS " .
       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
       "\n".
+    "# Resource compilation flags\n".
+    "RCFLAGS = \n".
     "\n".
     "# Get include directory for resource compiler\n".
     "\n".
@@ -1184,13 +1311,18 @@ if (defined $makefiles{'lcc'}) {
     }
 
     foreach $d (&deps("X.obj", "X.res", $dirpfx, "\\", "lcc")) {
-      print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
-        "\n";
+      if ($forceobj{$d->{obj_orig}}) {
+         printf("%s: FORCE\n", $d->{obj});
+      } else {
+         print &splitline(sprintf("%s: %s", $d->{obj},
+                          join " ", @{$d->{deps}})), "\n";
+      }
       if ($d->{obj} =~ /\.obj$/) {
 	  print &splitline("\tlcc -O -p6 \$(COMPAT)".
-			   " \$(XFLAGS) \$(CFLAGS) ".$d->{deps}->[0],69)."\n";
+			   " \$(CFLAGS) \$(XFLAGS) ".$d->{deps}->[0],69)."\n";
       } else {
-	  print &splitline("\tlrc \$(RCFL) -r ".$d->{deps}->[0],69)."\n";
+          print &splitline("\tlrc \$(RCFL) -r \$(RCFLAGS) ".
+                           $d->{deps}->[0],69)."\n";
       }
     }
     print "\n";
@@ -1198,7 +1330,9 @@ if (defined $makefiles{'lcc'}) {
     print "\nclean:\n".
     "\t-del *.obj\n".
     "\t-del *.exe\n".
-    "\t-del *.res\n";
+    "\t-del *.res\n".
+    "\n".
+    "FORCE:\n";
 
     select STDOUT; close OUT;
 }
@@ -1213,7 +1347,7 @@ if (defined $makefiles{'osx'}) {
     "#\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
-    ($_ = $help) =~ s/=\/D/=-D/gs;
+    ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
     print $_;
     print
     "CC = \$(TOOLPATH)gcc\n".
@@ -1262,18 +1396,214 @@ if (defined $makefiles{'osx'}) {
                        $objstr . " $libstr", 69), "\n\n";
     }
     foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
-      print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
-          "\n";
+      if ($forceobj{$d->{obj_orig}}) {
+         printf("%s: FORCE\n", $d->{obj});
+      } else {
+         print &splitline(sprintf("%s: %s", $d->{obj},
+                                  join " ", @{$d->{deps}})), "\n";
+      }
       $firstdep = $d->{deps}->[0];
       if ($firstdep =~ /\.c$/) {
-	  print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n";
+	  print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS) -c \$<\n";
       } elsif ($firstdep =~ /\.m$/) {
-	  print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n";
+	  print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS) -c \$<\n";
       }
     }
     print "\n".$makefile_extra{'osx'}->{'end'};
     print "\nclean:\n".
-    "\trm -f *.o *.dmg". (join "", map { " $_" } &progrealnames("U")) . "\n";
+    "\trm -f *.o *.dmg". (join "", map { " $_" } &progrealnames("U")) . "\n".
     "\trm -rf *.app\n";
+    "\n".
+    "FORCE:\n";
     select STDOUT; close OUT;
 }
+
+if (defined $makefiles{'devcppproj'}) {
+    $dirpfx = &dirpfx($makefiles{'devcppproj'}, "\\");
+    $orig_dir = cwd;
+
+    ##-- Dev-C++ 5 projects
+    #
+    # Note: All files created in this section are written in binary
+    # mode to prevent any posibility of misinterpreted line endings.
+    # I don't know if Dev-C++ is as touchy as MSVC with LF-only line
+    # endings. But however, CRLF line endings are the common way on
+    # Win32 machines where Dev-C++ is running.
+    # Hence, in order for mkfiles.pl to generate CRLF project files
+    # even when run from Unix, I make sure all files are binary and
+    # explicitly write the CRLFs.
+    #
+    # Create directories if necessary
+    mkdir $makefiles{'devcppproj'}
+        if(! -d $makefiles{'devcppproj'});
+    chdir $makefiles{'devcppproj'};
+    @deps = &deps("X.obj", "X.res", $dirpfx, "\\", "devcppproj");
+    %all_object_deps = map {$_->{obj} => $_->{deps}} @deps;
+    # Make dir names FAT/NTFS compatible
+    my @srcdirs = @srcdirs;
+    for ($i=0; $i<@srcdirs; $i++) {
+      $srcdirs[$i] =~ s/\//\\/g;
+      $srcdirs[$i] =~ s/\\$//;
+    }
+    # Create the project files
+    # Get names of all Windows projects (GUI and console)
+    my @prognames = &prognames("G:C");
+    foreach $progname (@prognames) {
+      create_devcpp_project(\%all_object_deps, $progname);
+    }
+
+    sub create_devcpp_project {
+      my ($all_object_deps, $progname) = @_;
+      # Construct program's dependency info (Taken from 'vcproj', seems to work right here, too.)
+      %seen_objects = ();
+      %lib_files = ();
+      %source_files = ();
+      %header_files = ();
+      %resource_files = ();
+      @object_files = split " ", &objects($progname, "X.obj", "X.res", "X.lib");
+      foreach $object_file (@object_files) {
+      next if defined $seen_objects{$object_file};
+      $seen_objects{$object_file} = 1;
+      if($object_file =~ /\.lib$/io) {
+    $lib_files{$object_file} = 1;
+    next;
+      }
+      $object_deps = $all_object_deps{$object_file};
+      foreach $object_dep (@$object_deps) {
+    if($object_dep =~ /\.c$/io) {
+        $source_files{$object_dep} = 1;
+        next;
+    }
+    if($object_dep =~ /\.h$/io) {
+        $header_files{$object_dep} = 1;
+        next;
+    }
+    if($object_dep =~ /\.(rc|ico)$/io) {
+        $resource_files{$object_dep} = 1;
+        next;
+    }
+      }
+      }
+      $libs = join " ", sort keys %lib_files;
+      @source_files = sort keys %source_files;
+      @header_files = sort keys %header_files;
+      @resources = sort keys %resource_files;
+  ($windows_project, $type) = split ",", $progname;
+      mkdir $windows_project
+      if(! -d $windows_project);
+      chdir $windows_project;
+
+  $subsys = ($type eq "G") ? "0" : "1";  # 0 = Win32 GUI, 1 = Win32 Console
+      open OUT, ">$windows_project.dev"; binmode OUT; select OUT;
+      print
+      "# DEV-C++ 5 Project File - $windows_project.dev\r\n".
+      "# ** DO NOT EDIT **\r\n".
+      "\r\n".
+      # No difference between DEBUG and RELEASE here as in 'vcproj', because
+      # Dev-C++ does not support mutiple compilation profiles in one single project.
+      # (At least I can say this for Dev-C++ 5 Beta)
+      "[Project]\r\n".
+      "FileName=$windows_project.dev\r\n".
+      "Name=$windows_project\r\n".
+      "Ver=1\r\n".
+      "IsCpp=1\r\n".
+      "Type=$subsys\r\n".
+      # Multimon is disabled here, as Dev-C++ (Version 5 Beta) does not have multimon.h
+      "Compiler=-W -D__GNUWIN32__ -DWIN32 -DNDEBUG -D_WINDOWS -DNO_MULTIMON -D_MBCS_\@\@_\r\n".
+      "CppCompiler=-W -D__GNUWIN32__ -DWIN32 -DNDEBUG -D_WINDOWS -DNO_MULTIMON -D_MBCS_\@\@_\r\n".
+      "Includes=" . (join ";", map {"..\\..\\$dirpfx$_"} @srcdirs) . "\r\n".
+      "Linker=-ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -limm32 -lshell32 -luser32 -lwinmm -lwinspool_\@\@_\r\n".
+      "Libs=\r\n".
+      "UnitCount=" . (@source_files + @header_files + @resources) . "\r\n".
+      "Folders=\"Header Files\",\"Resource Files\",\"Source Files\"\r\n".
+      "ObjFiles=\r\n".
+      "PrivateResource=${windows_project}_private.rc\r\n".
+      "ResourceIncludes=..\\..\\..\\WINDOWS\r\n".
+      "MakeIncludes=\r\n".
+      "Icon=\r\n". # It's ok to leave this blank.
+      "ExeOutput=\r\n".
+      "ObjectOutput=\r\n".
+      "OverrideOutput=0\r\n".
+      "OverrideOutputName=$windows_project.exe\r\n".
+      "HostApplication=\r\n".
+      "CommandLine=\r\n".
+      "UseCustomMakefile=0\r\n".
+      "CustomMakefile=\r\n".
+      "IncludeVersionInfo=0\r\n".
+      "SupportXPThemes=0\r\n".
+      "CompilerSet=0\r\n".
+      "CompilerSettings=0000000000000000000000\r\n".
+      "\r\n";
+      $unit_count = 1;
+      foreach $source_file (@source_files) {
+      print
+        "[Unit$unit_count]\r\n".
+        "FileName=..\\..\\$source_file\r\n".
+        "Folder=Source Files\r\n".
+        "Compile=1\r\n".
+        "CompileCpp=0\r\n".
+        "Link=1\r\n".
+        "Priority=1000\r\n".
+        "OverrideBuildCmd=0\r\n".
+        "BuildCmd=\r\n".
+        "\r\n";
+      $unit_count++;
+  }
+      foreach $header_file (@header_files) {
+      print
+        "[Unit$unit_count]\r\n".
+        "FileName=..\\..\\$header_file\r\n".
+        "Folder=Header Files\r\n".
+        "Compile=1\r\n".
+        "CompileCpp=1\r\n". # Dev-C++ want's to compile all header files with both compilers C and C++. It does not hurt.
+        "Link=1\r\n".
+        "Priority=1000\r\n".
+        "OverrideBuildCmd=0\r\n".
+        "BuildCmd=\r\n".
+        "\r\n";
+      $unit_count++;
+  }
+      foreach $resource_file (@resources) {
+      if ($resource_file =~ /.*\.(ico|cur|bmp|dlg|rc2|rct|bin|rgs|gif|jpg|jpeg|jpe)/io) { # Default filter as in 'vcproj'
+        $Compile = "0";    # Don't compile images and other binary resource files
+        $CompileCpp = "0";
+      } else {
+        $Compile = "1";
+        $CompileCpp = "1"; # Dev-C++ want's to compile all .rc files with both compilers C and C++. It does not hurt.
+      }
+      print
+        "[Unit$unit_count]\r\n".
+        "FileName=..\\..\\$resource_file\r\n".
+        "Folder=Resource Files\r\n".
+        "Compile=$Compile\r\n".
+        "CompileCpp=$CompileCpp\r\n".
+        "Link=0\r\n".
+        "Priority=1000\r\n".
+        "OverrideBuildCmd=0\r\n".
+        "BuildCmd=\r\n".
+        "\r\n";
+      $unit_count++;
+  }
+      #Note: By default, [VersionInfo] is not used.
+      print
+      "[VersionInfo]\r\n".
+      "Major=0\r\n".
+      "Minor=0\r\n".
+      "Release=1\r\n".
+      "Build=1\r\n".
+      "LanguageID=1033\r\n".
+      "CharsetID=1252\r\n".
+      "CompanyName=\r\n".
+      "FileVersion=0.1\r\n".
+      "FileDescription=\r\n".
+      "InternalName=\r\n".
+      "LegalCopyright=\r\n".
+      "LegalTrademarks=\r\n".
+      "OriginalFilename=$windows_project.exe\r\n".
+      "ProductName=$windows_project\r\n".
+      "ProductVersion=0.1\r\n".
+      "AutoIncBuildNr=0\r\n";
+      select STDOUT; close OUT;
+      chdir "..";
+    }
+}