Przeglądaj źródła

Added missing GLSceneParallel.rc

GLScene 3 lat temu
rodzic
commit
2b5371d716

+ 4 - 1
Packages/GLScene_Parallel_DT.dproj

@@ -122,6 +122,9 @@
         <DCCReference Include="..\Source\CUDA.PropEditors.pas"/>
         <DCCReference Include="..\Source\CUDA.Register.pas"/>
         <DCCReference Include="..\Source\CUDA.EditorFm.pas"/>
+        <RcCompile Include="..\Resources\GLSceneParallel.rc">
+            <Form>GLSceneParallel.res</Form>
+        </RcCompile>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -155,7 +158,7 @@
                 <Platform value="Win64">False</Platform>
             </Platforms>
             <Deployment Version="3">
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\GLScene_Parallel_DT.bpl" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Parallel_DT.bpl" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>GLScene_Parallel_DT.bpl</RemoteName>
                         <Overwrite>true</Overwrite>

+ 1 - 1
external/GR32/GR32_Blend.pas

@@ -871,7 +871,7 @@ begin
   {$ELSE}
   alpha_ptr := Pointer(Cardinal(AlphaTable) and (not $F));
   if Cardinal(alpha_ptr) < Cardinal(AlphaTable) then
-    Inc(Cardinal(alpha_ptr), 16);
+    Inc(NativeInt(alpha_ptr), 16);
   {$ENDIF}
   P := alpha_ptr;
   for I := 0 to 255 do

+ 9 - 3
external/GR32/GR32_Text_VCL.pas

@@ -153,11 +153,13 @@ begin
   while Res > 0 do
   begin
     S := BufferPtr.cb - SizeOf(TTTPolygonHeader);
-    {$IFDEF HAS_NATIVEINT}
+//    {$IFDEF HAS_NATIVEINT}
     NativeInt(CurvePtr) := NativeInt(BufferPtr) + SizeOf(TTTPolygonHeader);
+(*
     {$ELSE}
     Integer(CurvePtr) := Integer(BufferPtr) + SizeOf(TTTPolygonHeader);
     {$ENDIF}
+*)
     P1 := PointFXtoPointF(BufferPtr.pfxStart);
     Path.MoveTo(P1.X + DstX, P1.Y + DstY);
     while S > 0 do
@@ -202,21 +204,25 @@ begin
       K := (CurvePtr.cpfx - 1) * SizeOf(TPointFX) + SizeOf(TTPolyCurve);
       Dec(S, K);
 
-      {$IFDEF HAS_NATIVEINT}
+//      {$IFDEF HAS_NATIVEINT}
       Inc(NativeInt(CurvePtr), K);
+(*
       {$ELSE}
       Inc(Integer(CurvePtr), K);
       {$ENDIF}
+*)
     end;
 
     Path.EndPath(True);
 
     Dec(Res, BufferPtr.cb);
-    {$IFDEF HAS_NATIVEINT}
+//    {$IFDEF HAS_NATIVEINT}
     Inc(NativeInt(BufferPtr), BufferPtr.cb);
+(*
     {$ELSE}
     Inc(integer(BufferPtr), BufferPtr.cb);
     {$ENDIF}
+*)
   end;
 
   {$IFDEF USESTACKALLOC}