Browse Source

* Refactor, so the combination CPU-OS-SubTarget is a record. Allows for extension if need be

Michael VAN CANNEYT 2 years ago
parent
commit
fa735ba7b2
3 changed files with 414 additions and 112 deletions
  1. 412 110
      packages/fpmkunit/src/fpmkunit.pp
  2. 1 1
      packages/gdbint/fpmake.pp
  3. 1 1
      packages/ide/fpmake.pp

File diff suppressed because it is too large
+ 412 - 110
packages/fpmkunit/src/fpmkunit.pp


+ 1 - 1
packages/gdbint/fpmake.pp

@@ -93,7 +93,7 @@ begin
       Installer.BuildEngine.Log(vlCommand,'GDB-lib found, compiling and running gdbver to obtain GDB-version');
       Installer.BuildEngine.Log(vlCommand,'GDB-lib found, compiling and running gdbver to obtain GDB-version');
       Installer.BuildEngine.Compile(P,GdbVerTarget);
       Installer.BuildEngine.Compile(P,GdbVerTarget);
       Cmd:=Installer.BuildEngine.AddPathPrefix(p,
       Cmd:=Installer.BuildEngine.AddPathPrefix(p,
-            p.GetBinOutputDir(Defaults.CPU, Defaults.OS))+
+            p.GetBinOutputDir(Defaults.CompileTarget ))+
             PathDelim+
             PathDelim+
             AddProgramExtension('gdbver',Defaults.BuildOS);
             AddProgramExtension('gdbver',Defaults.BuildOS);
       Opts:=TStringList.Create;
       Opts:=TStringList.Create;

+ 1 - 1
packages/ide/fpmake.pp

@@ -310,7 +310,7 @@ begin
         if CompilerTarget<>Defaults.CPU then
         if CompilerTarget<>Defaults.CPU then
           begin
           begin
             T.SetExeName(AddProgramExtension(CPUToString(CompilerTarget)+'-fp',Defaults.BuildOS));
             T.SetExeName(AddProgramExtension(CPUToString(CompilerTarget)+'-fp',Defaults.BuildOS));
-            P.SetUnitsOutputDir(P.GetUnitsOutputDir(Defaults.BuildCPU,Defaults.BuildOS)+CPUToString(CompilerTarget));
+            P.SetUnitsOutputDir(P.GetUnitsOutputDir(Defaults.BuildTarget)+CPUToString(CompilerTarget));
             P.Options.Add('-dCROSSGDB');
             P.Options.Add('-dCROSSGDB');
           end;
           end;
 
 

Some files were not shown because too many files changed in this diff