Delphi/pascalscript
Delphi/pascalscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add PS_USECLASSICINVOKE to make it possible to avoid using InvokeCall.inc which was introduced by #207. Alse cleanup the case some of the directives here and make it work on AUTOREFCOUNT.

Browse Source
This commit is contained in:
Martijn Laan 2020-02-20 15:26:37 +01:00
parent 45b18b0259
commit f55409add2
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Source/uPSRuntime.pas
View File

@ -9839,15 +9839,21 @@ begin
end;
{$ifndef FPC}
{$IFNDEF FPC}
{$UNDEF _INVOKECALL_INC_}
{$IFDEF DELPHI23UP} // DELPHI2010UP == DELPHI14UP
{$IFDEF AUTOREFCOUNT}
{$fatal Pascal Script does not supports compilation with AUTOREFCOUNT at the moment!}
{$ELSE}
{$include InvokeCall.inc}
{$DEFINE _INVOKECALL_INC_}
{$ENDIF}
{$UNDEF USEINVOKECALL}
{$IFDEF DELPHI23UP}
{$IFNDEF AUTOREFCOUNT}
{$IFNDEF PS_USECLASSICINVOKE}
{$DEFINE USEINVOKECALL}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$IFDEF USEINVOKECALL}
{$include InvokeCall.inc}
{$DEFINE _INVOKECALL_INC_}
{$ELSE}
{$IFDEF Delphi6UP}
{$IFDEF CPUX64}
@ -9859,23 +9865,23 @@ end;
{$include x86.inc}
{$ENDIF}
{$ENDIF}
{$else} //fpc includes left unchanged.
{$IFDEF Delphi6UP}
{$if defined(cpu86)}
{$include x86.inc}
{$elseif defined(cpupowerpc)}
{$include powerpc.inc}
{$elseif defined(cpuarm)}
{$include arm.inc}
{$elseif defined(CPUX86_64)}
{$include x64.inc}
{$else}
{$fatal Pascal Script is not supported for your architecture at the moment!}
{$ifend}
{$ELSE}
{$include x86.inc}
{$IFDEF Delphi6UP}
{$if defined(cpu86)}
{$include x86.inc}
{$elseif defined(cpupowerpc)}
{$include powerpc.inc}
{$elseif defined(cpuarm)}
{$include arm.inc}
{$elseif defined(CPUX86_64)}
{$include x64.inc}
{$else}
{$fatal Pascal Script is not supported for your architecture at the moment!}
{$ifend}
{$ELSE}
{$include x86.inc}
{$ENDIF}
{$ENDIF}
{$endif}
type
PScriptMethodInfo = ^TScriptMethodInfo;