Skip to content

Commit 0e26519

Browse files
committed
fix:
- Correção de compilação para Delphi 10.2 Tokyo, testes pendentes
1 parent b722a5d commit 0e26519

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

src/utils/RALJSON_Delphi.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,8 @@ begin
408408
if Self = nil then
409409
Exit;
410410

411-
{$IFDEF DELPHI10_1UP}
411+
//TODO Conferir no 10.2 Tokyo se isso aqui vai dar erro
412+
{$IFDEF DELPHI10_3UP}
412413
vObj := JsonObject.FindValue(AName);
413414
{$ELSE}
414415
vObj := nil;

src/wizard/delphi/RALWizard.pas

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,22 @@ function TRALWizard.GetState: TWizardState;
187187
end;
188188
{$ENDIF}
189189

190-
{$IFDEF DELPHI10_2UP}
190+
{$IF Defined(DELPHI10_2UP) AND NOT Defined(DELPHI10_3UP)}
191+
function TRALWizard.GetSupportedPlatforms: TArray<string>;
192+
begin
193+
SetLength(Result, 4);
194+
Result[0] := cWin32Platform;
195+
Result[1] := cWin64Platform;
196+
Result[2] := cLinux64Platform;
197+
Result[3] := ciOSDevice64Platform;
198+
// Result[3] := cOSX64Platform;
199+
// Result[4] := ciOSSimulator64Platform;
200+
// Result[6] := cAndroidArm32Platform;
201+
// Result[7] := cAndroidArm64Platform;
202+
end;
203+
{$IFEND}
204+
205+
{$IFDEF DELPHI10_3UP}
191206
function TRALWizard.GetSupportedPlatforms: TArray<string>;
192207
begin
193208
SetLength(Result, 6);

0 commit comments

Comments
 (0)