Browse Source

* Fix compilation with recent versions

Michaël Van Canneyt 2 years ago
parent
commit
3c5d428952
1 changed files with 4 additions and 0 deletions
  1. 4 0
      fpmake.pp

+ 4 - 0
fpmake.pp

@@ -211,7 +211,11 @@ begin
     {$ENDIF}
     {$ENDIF}
     P.Targets.AddImplicitUnit('stubcreator',False).ResourceStrings:=True;
     P.Targets.AddImplicitUnit('stubcreator',False).ResourceStrings:=True;
     // Determine unit files location
     // Determine unit files location
+    {$IF DECLARED(TCompileTarget)}
+    BD:=IncludeTrailingPathDelimiter(P.GetBinOutputDir(Defaults.BuildTarget));
+    {$ELSE} 
     BD:=IncludeTrailingPathDelimiter(P.GetBinOutputDir(Defaults.BuildCPU,Defaults.BuildOS));
     BD:=IncludeTrailingPathDelimiter(P.GetBinOutputDir(Defaults.BuildCPU,Defaults.BuildOS));
+    {$ENDIF}
     TmpCfg:='compiler/utils/pas2js/dist/pas2js.cfg';
     TmpCfg:='compiler/utils/pas2js/dist/pas2js.cfg';
     Case Installer.RunMode of
     Case Installer.RunMode of
     rmCompile,rmBuild:
     rmCompile,rmBuild: