Mikolaj Zalewski : add resource file directory to include directories

Alexandre Julliard julliard at winehq.org
Fri Jun 19 08:36:20 CDT 2009


Module: tools
Branch: master
Commit: 78fa6773a4b1f1df57ce1da0fb7a0b9e1bd92744
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=78fa6773a4b1f1df57ce1da0fb7a0b9e1bd92744

Author: Mikolaj Zalewski <mikolajz at tygrys.dom>
Date:   Wed Mar 19 14:20:05 2008 +0100

add resource file directory to include directories

---

 scripts/checkmakefile.pl |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/checkmakefile.pl b/scripts/checkmakefile.pl
index 6119eca..cc5064f 100755
--- a/scripts/checkmakefile.pl
+++ b/scripts/checkmakefile.pl
@@ -4,6 +4,7 @@
 # on resource files and call ver.pl to parse the results
 
 use Cwd;
+use File::Basename;
 
 sub log_string
 {
@@ -32,7 +33,8 @@ sub mycheck
 
     log_string("*** $name [$defs]");
 
-    $ret = system("$wrc -I$winedir/include -I$winedir/dlls/user32 --verify-translation $defs $name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt");
+    my($respath) = dirname($name);
+    $ret = system("$wrc -I$respath -I$winedir/include -I$winedir/dlls/user32 --verify-translation $defs $name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt");
     if ($ret == 0)
     {
         $name =~ s,$winedir,,;
@@ -46,7 +48,7 @@ sub mycheck
         $norm_fn= $name;
         $norm_fn =~ s/\.rc$//;
         $norm_fn =~ s/[^a-zA-Z0-9]/-/g;
-        $ret = system("$wrc -I$winedir/include -I$winedir/dlls/user32 $defs $winedir$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null");
+        $ret = system("$wrc -I$respath -I$winedir/include -I$winedir/dlls/user32 $defs $winedir$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null");
         if ($ret != 0)
         {
             print "!!!!!!! 2nd pass return value: ".$ret."\n";        




More information about the wine-cvs mailing list