Fix problems with resource compilation Makefile lines

git-svn-id: svn://svn.tartarus.org/sgt/putty@371 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Makefile b/Makefile
index 605cf91..c141399 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@
 #  - COMPAT=/DWIN32S_COMPAT
 #      Generates a binary that works (minimally) with Win32s.
 #
-#  - CFL=/DASCIICTLS
+#  - 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
@@ -124,13 +124,13 @@ versionpseudotarget:
 win_res.$(RES): win_res.rc win_res.h putty.ico
 ##--
 win_res.$(RES):
-       rc $(FWHACK) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
+       rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
 
 ##-- dependencies
 scp.$(RES): scp.rc scp.ico
 ##--
 scp.$(RES):
-       rc $(FWHACK) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 scp.rc
+       rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 scp.rc
 
 clean:
        del *.obj

diff --git a/mkfiles.pl b/mkfiles.pl
index ab896c5..a2b4dd9 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -85,7 +85,7 @@ print
 "\t\$(CC) \$(FWHACK) \$(CFLAGS) -c \$<\n".
 "\n".
 "%.o: %.rc\n".
-"\t\$(RC) \$(FWHACK) \$(RCFLAGS) \$<\n".
+"\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) \$< \$\@\n".
 "\n";
 foreach $p (@projects) {
   print $p, ".exe: ", &project($p), "\n";
@@ -127,7 +127,7 @@ print
 ".c.obj:\n".
 "\tbcc32 \$(COMPAT) \$(FWHACK) \$(CFLAGS) /c \$*.c\n".
 ".rc.res:\n".
-"\tbrc32 \$(FWHACK) -i \$(BCB)\\include \\\n".
+"\tbrc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include \\\n".
 "\t\t-r -DWIN32 -D_WIN32 -DWINVER=0x0400 \$*.rc\n".
 "\n".
 "OBJ=obj\n".