瀏覽代碼

* If one include-file is resolved, do not stop resolving the other include-files

git-svn-id: trunk@25214 -
joost 12 年之前
父節點
當前提交
531ce2dfc2
共有 1 個文件被更改,包括 2 次插入5 次删除
  1. 2 5
      packages/fpmkunit/src/fpmkunit.pp

+ 2 - 5
packages/fpmkunit/src/fpmkunit.pp

@@ -5165,11 +5165,8 @@ Procedure TBuildEngine.ResolveFileNames(APackage : TPackage; ACPU:TCPU;AOS:TOS;D
         if (D.DependencyType=depInclude) then
         if (D.DependencyType=depInclude) then
           begin
           begin
             if D.TargetFileName<>'' then
             if D.TargetFileName<>'' then
-              begin
-              Exit;
-              Log(vlDebug,SDbgSourceAlreadyResolved,[T.Name]);
-              end;
-            if (ACPU in D.CPUs) and (AOS in D.OSes) then
+              Log(vlDebug,SDbgSourceAlreadyResolved,[D.Value])
+            else if (ACPU in D.CPUs) and (AOS in D.OSes) then
               begin
               begin
                 if ExtractFilePath(D.Value)='' then
                 if ExtractFilePath(D.Value)='' then
                   begin
                   begin