소스 검색

* Fix bug #37445, find resource file in subdir

git-svn-id: trunk@46502 -
michael 5 년 전
부모
커밋
460dc49d68
1개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 8 1
      packages/pastojs/src/pas2jsfilecache.pp

+ 8 - 1
packages/pastojs/src/pas2jsfilecache.pp

@@ -1988,11 +1988,18 @@ var
 
 
   function SearchInDir(Dir: string; var Filename: string): boolean;
   function SearchInDir(Dir: string; var Filename: string): boolean;
   // search in Dir for pp, pas, p times given case, lower case, upper case
   // search in Dir for pp, pas, p times given case, lower case, upper case
+  var
+    CurFile : String;
   begin
   begin
     Dir:=IncludeTrailingPathDelimiter(Dir);
     Dir:=IncludeTrailingPathDelimiter(Dir);
     if IndexOfFile(SearchedDirs,Dir)>=0 then exit(false);
     if IndexOfFile(SearchedDirs,Dir)>=0 then exit(false);
     SearchedDirs.Add(Dir);
     SearchedDirs.Add(Dir);
-    if SearchLowUpCase(Filename) then exit(true);
+    CurFile:=Dir+Filename;
+    if SearchLowUpCase(CurFile) then
+      begin
+      FileName:=CurFile;
+      exit(true);
+      end;
     Result:=false;
     Result:=false;
   end;
   end;