FPC compatibility

Author: pyscripter

PythonForDelphi/Components/Sources/Core/Definition.Inc

@@ -284,7 +284,7 @@
   {$IFDEF CPU64}
     {$DEFINE CPUX64}
   {$ENDIF CPU64}
-  {$IF DEFINED(FPC_VER) and (FPC_VER > 5)}
+  {$IF DEFINED(FPC_VER) and (FPC_VER >= 5)}
     {$DEFINE USESYSTEMDISPINVOKE}
   {$IFEND}
 {$ENDIF FPC}

PythonForDelphi/Components/Sources/Core/VarPyth.pas

@@ -1058,10 +1058,6 @@   TStringDesc = record
       end
     else
     begin
-      {$IFDEF FPC}
-        {$HINT CVarTypeToElementInfo not yet implemented}
-        RaiseDispError;
-      {$ELSE}
       LArguments[I].VType := LArgType;
       case CVarTypeToElementInfo[LArgType].Size of
         1, 2, 4:
@@ -1077,7 +1073,6 @@   TStringDesc = record
       else
         RaiseDispError;
       end;
-      {$ENDIF}
     end;
     Inc(NativeInt(LParamPtr), SizeOf(Pointer));
   end;

PythonForDelphi/Components/p4dlaz.lpk

@@ -5,10 +5,10 @@
     <Name Value="P4DLaz"/>
     <AddToProjectUsesSection Value="True"/>
     <CompilerOptions>
-      <Version Value="10"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="$(PackageDir);$(PackageDir)\Sources\Core"/>
+        <OtherUnitFiles Value="Sources\Core"/>
       </SearchPaths>
       <Parsing>
         <SyntaxOptions>
@@ -51,7 +51,7 @@
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PackageDir);$(PackageDir)\Sources\Core"/>
+      <UnitPath Value="$(PkgDir);$(PkgDir)\Sources\Core"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>

PythonForDelphi/Components/p4dlaz.pas

@@ -7,16 +7,14 @@
 interface
 
 uses
-  PythonEngine, PythonGUIInputOutput, PythonAction, MethodCallBack, VarPyth, 
-  LazarusPackageIntf;
+  PythonEngine, PythonGUIInputOutput, MethodCallBack, LazarusPackageIntf;
 
 implementation
-
+{$R Sources\Core\PythonEngine.dcr}
 procedure Register; 
 begin
   RegisterUnit('PythonEngine', @PythonEngine.Register); 
   RegisterUnit('PythonGUIInputOutput', @PythonGUIInputOutput.Register); 
-  RegisterUnit('PythonAction', @PythonAction.Register); 
 end; 
 
 initialization