From a519e8edfc9723ba0ef1001ac72c419e7c35402c Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Thu, 24 Feb 2005 22:45:50 +0000 Subject: [PATCH] Add RT_MANIFEST arguments to dependencies for Windows resource objects. [originally from svn r5393] --- mkfiles.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mkfiles.pl b/mkfiles.pl index f78f67f5..5483d412 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -152,9 +152,11 @@ foreach $i (@prognames) { # added back on to @scanlist to be scanned in turn (if not already # done). # -# Resource scripts (.rc) can also include a file by means of a line -# ending `ICON "filename"'. Files included by this method are not -# added to @scanlist because they can never include further files. +# Resource scripts (.rc) can also include a file by means of: +# - a line # ending `ICON "filename"'; +# - a line ending `RT_MANIFEST "filename"'. +# Files included by this method are not added to @scanlist because +# they can never include further files. # # In this pass we write out a hash %further which maps a source # file name into a listref containing further source file names. @@ -174,8 +176,8 @@ while (scalar @scanlist > 0) { push @scanlist, $1; next; }; - /ICON\s+\"([^\"]+)\"\s*$/ and do { - push @{$further{$file}}, $1; + /(RT_MANIFEST|ICON)\s+\"([^\"]+)\"\s*$/ and do { + push @{$further{$file}}, $2; next; } }