Tweaks for d5 support from Eric Jansen eric.thuisremovethis@planet.nl

git-svn-id: http://code.remobjects.com/svn/pascalscript@230 5c9d2617-0215-0410-a2ee-e80e04d1c6d8

Source/PascalScript_Core_D5.dpk

@@ -1,7 +1,7 @@
 package PascalScript_Core_D5;
 
 {$R *.res}
-{$ALIGN 8}
+{$ALIGN ON}
 {$ASSERTIONS ON}
 {$BOOLEVAL OFF}
 {$DEBUGINFO ON}
@@ -27,9 +27,8 @@ package PascalScript_Core_D5;
 {$IMPLICITBUILD OFF}
 
 requires
-  rtl,
-  vcl,
-  dbrtl;
+  vcl50,
+  vcldb50;
 
 contains
   uPSC_extctrls in 'uPSC_extctrls.pas',

Source/eDefines.inc

@@ -147,7 +147,9 @@
     {$DEFINE WIN16}
   {$ENDIF}
 {$ENDIF}
-
+{$IFDEF WIN32}
+{$DEFINE MSWINDOWS}
+{$ENDIF}
 { defines for Delphi 1.0 thru 7.0 }
 {$IFDEF MSWINDOWS}
 

Source/uPSCompiler.pas

@@ -1720,7 +1720,7 @@ procedure DisposeVariant(p: PIfRVariant);
 
 implementation
 
-uses Classes, typInfo;
+uses {$IFDEF DELPHI5}ComObj, {$ENDIF}Classes, typInfo;
 
 {$IFDEF DELPHI3UP}
 resourceString

Source/uPSRuntime.pas

@@ -9195,7 +9195,7 @@ begin
     else Result:=false;
   end;
 end;
-
+{$IFNDEF DELPHI6UP}
 function _VarArrayGet(var S : Variant; I : Integer) : Variant;
 begin
   result := VarArrayGet(S, [I]);
@@ -9205,7 +9205,7 @@ procedure _VarArraySet(const c : Variant; I : Integer; var s : Variant);
 begin
   VarArrayPut(s, c, [i]);
 end;
-
+{$ENDIF}
 
 procedure TPSExec.RegisterStandardProcs;
 begin
@@ -9282,10 +9282,12 @@ begin
   {$IFNDEF PS_NOWIDESTRING}
   RegisterFunctionName('WSTRGET', DefProc, Pointer(42), nil);
   RegisterFunctionName('WSTRSET', DefProc, Pointer(43), nil);
+
   {$ENDIF}
+  {$IFNDEF DELPHI6UP}
   RegisterDelphiFunction(@_VarArrayGet, 'VARARRAYGET', cdRegister);
   RegisterDelphiFunction(@_VarArraySet, 'VARARRAYSET', cdRegister);
-
+  {$ENDIF}
   RegisterInterfaceLibraryRuntime(Self);
 end;