Changeset 124 for trunk


Ignore:
Timestamp:
Jan 14, 2022, 3:03:42 PM (2 years ago)
Author:
chronos
Message:
  • Modified: Use IFDEF UNIX instead of IFDEF LINUX.
  • Modified: Localized error message.
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormOutput.pas

    r112 r124  
    3939    if OutputChanged then begin
    4040      OutputChanged := False;
    41       {$IFDEF LINUX}
     41      {$IFDEF UNIX}
    4242      MemoOutput.Lines.Text := StringReplace(Output, #10#13, LineEnding, [rfReplaceAll])
    4343      {$ELSE}

  • trunk/Languages/LazFuck.cs.po

    r122 r124  
    233233#: tformmemory.label6.caption
    234234msgid "Memory:"
    235 msgstr "Paměť"
     235msgstr "Paměť:"
    236236
    237237#: tformmemory.listviewmemory.columns[0].caption
    … …  
    472472msgstr "Cesta překladače"
    473473
     474#: ubftarget.sunsupportedcommand
     475#, object-pascal-format
     476msgid "Unsupported command %d"
     477msgstr "NepodporovanÃœ příkaz %d"
     478
    474479#: uformcpu.sstepspersecond
    475480msgid " steps/s"

  • trunk/Languages/LazFuck.pot

    r122 r124  
    462462msgstr ""
    463463
     464#: ubftarget.sunsupportedcommand
     465#, object-pascal-format
     466msgid "Unsupported command %d"
     467msgstr ""
     468
    464469#: uformcpu.sstepspersecond
    465470msgid " steps/s"

  • trunk/Target/UTargetC.pas

    r105 r124  
    3535  ImageIndex := 23;
    3636  Capabilities := [tcCompile, tcRun];
    37   {$IFDEF Windows}
     37  {$IFDEF WINDOWS}
    3838  CompilerPath := 'c:\Program Files\MinGW\bin\gcc.exe';
    3939  CompiledExtension := '.exe';
    4040  RunExtension := '';
    4141  {$ENDIF}
    42   {$IFDEF Linux}
     42  {$IFDEF UNIX}
    4343  CompilerPath := '/usr/bin/gcc';
    4444  CompiledExtension := '';

  • trunk/Target/UTargetCSharp.pas

    r90 r124  
    3535  ImageIndex := 27;
    3636  Capabilities := [tcCompile, tcRun];
    37   {$IFDEF Windows}
     37  {$IFDEF WINDOWS}
    3838  CompilerPath := 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\Roslyn\csc.exe';
    3939  ExecutorPath := '';
    4040  {$ENDIF}
    41   {$IFDEF Linux}
     41  {$IFDEF UNIX}
    4242  CompilerPath := '/usr/bin/mcs';
    4343  ExecutorPath := '';

  • trunk/Target/UTargetFPC.pas

    r87 r124  
    3232  ImageIndex := 22;
    3333  Capabilities := [tcCompile, tcRun];
    34   {$IFDEF Linux}
     34  {$IFDEF WINDOWS}
     35  CompiledExtension := '.exe';
     36  CompilerPath := 'fpc.exe';
     37  RunExtension := '';
     38  {$ENDIF}
     39  {$IFDEF UNIX}
    3540  CompiledExtension := '';
    3641  CompilerPath := '/usr/bin/fpc';
    37   RunExtension := '';
    38   {$ENDIF}
    39   {$IFDEF Windows}
    40   CompiledExtension := '.exe';
    41   CompilerPath := 'fpc.exe';
    4242  RunExtension := '';
    4343  {$ENDIF}

  • trunk/Target/UTargetJava.pas

    r96 r124  
    3535  ImageIndex := 24;
    3636  Capabilities := [tcCompile, tcRun];
    37   {$IFDEF Windows}
     37  {$IFDEF WINDOWS}
    3838  CompilerPath := 'c:\Program Files\Java\bin\javac.exe';
    3939  ExecutorPath := 'c:\Program Files\Java\bin\java.exe';
    4040  {$ENDIF}
    41   {$IFDEF Linux}
     41  {$IFDEF UNIX}
    4242  CompilerPath := '/usr/bin/javac';
    4343  ExecutorPath := '/usr/bin/java';

  • trunk/Target/UTargetPHP.pas

    r87 r124  
    3535  ImageIndex := 21;
    3636  Capabilities := [tcCompile, tcRun];
    37   {$IFDEF Windows}
     37  {$IFDEF WINDOWS}
    3838  CompilerPath := '';
    3939  ExecutorPath := 'c:\Program Files\PHP\php.exe';
    4040  {$ENDIF}
    41   {$IFDEF Linux}
     41  {$IFDEF UNIX}
    4242  CompilerPath := '';
    4343  ExecutorPath := '/usr/bin/php';

  • trunk/Target/UTargetPython.pas

    r87 r124  
    3535  ImageIndex := 26;
    3636  Capabilities := [tcCompile, tcRun];
    37   {$IFDEF Windows}
     37  {$IFDEF WINDOWS}
    3838  CompilerPath := '';
    3939  ExecutorPath := 'c:\Program Files\Python\python.exe';
    4040  {$ENDIF}
    41   {$IFDEF Linux}
     41  {$IFDEF UNIX}
    4242  CompilerPath := '';
    4343  ExecutorPath := '/usr/bin/python';

  • trunk/UBFTarget.pas

    r115 r124  
    6363implementation
    6464
     65resourcestring
     66  SUnsupportedCommand = 'Unsupported command %d';
     67
    6568{ TMachineOperation }
    6669
    … …  
    336339        NewProgram[NewProgramIndex] := FProgram[FProgramIndex];
    337340      end;
    338       else raise Exception.Create(Format('Unsupported command %d', [FProgram[FProgramIndex].Command]));
     341      else raise Exception.Create(Format(SUnsupportedCommand, [FProgram[FProgramIndex].Command]));
    339342    end;
    340343    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTargetIndex);
    … …  
    440443        end;
    441444      end;
    442       else raise Exception.Create(Format('Unsupported command %d', [FProgram[FProgramIndex].Command]));
     445      else raise Exception.Create(Format(SUnsupportedCommand, [FProgram[FProgramIndex].Command]));
    443446    end;
    444447    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTextIndex);

  • trunk/UCore.pas

    r116 r124  
    7070begin
    7171  DataDir := '';
    72   {$IFDEF Linux}
     72  {$IFDEF UNIX}
    7373  // If installed in Linux system then use installation shared game directory for data files
    7474  if DirectoryExists(LinuxDataDir) then

  • trunk/UTarget.pas

    r114 r124  
    385385begin
    386386  Result := FileName;
    387   {$IFDEF Windows}
     387  {$IFDEF WINDOWS}
    388388  Result := '"' + FileName + '"';
    389389  {$ENDIF}
    390   {$IFDEF Linux}
     390  {$IFDEF UNIX}
    391391  Result := StringReplace(FileName, ' ', '\ ', [rfReplaceAll]);
    392392  {$ENDIF}
Note: See TracChangeset for help on using the changeset viewer.