Reuse Android compiler outputs and remove old build artifacts

port-source/kam_remake/src/render/KM_Render.pas

@@ -2,9 +2,6 @@ unit KM_Render;
 {$I KaM_Remake.inc}
 interface
 uses
-  {$IFDEF WDC} Windows, {$ENDIF}
-  {$IFDEF Unix} LCLIntf, LCLType, OpenGLContext, {$ENDIF}
-  dglOpenGL,
   KM_RenderTypes, KM_CommonTypes;
 
 
@@ -60,8 +57,6 @@ implementation
 uses
   SysUtils, Math,
   CastleRenderContext, CastleRenderOptions,
-  KromOGLUtils, KromUtils,
-  KM_Defaults, KM_IoPNG, KM_CommonClasses,
   KM_Render_Mobile;
 
 { TKMRender }

port-source/kam_remake/src/res/KM_ResSprites.pas

@@ -92,11 +92,12 @@ type
 
     procedure LoadFromRXXFile(const aFileName: string; aStartingIndex: Integer = 1);
     procedure LoadFromRXXStream(aStream: TStream; aStartingIndex: Integer; aAllocateGFXData: Boolean);
-    procedure OverloadRXDataFromFolder(const aFolder: string; aOnProgress: TProc<string>; aSoftenShadows: Boolean = True);
+    procedure OverloadRXDataFromFolder(const aFolder: string; aOnProgress: {$IFDEF FPC}TUnicodeStringEvent{$ELSE}TProc<string>{$ENDIF}; aSoftenShadows: Boolean = True);
 
+    {$IFDEF WDC}
     function GetSoftenShadowType(aID: Integer): TKMSpriteSoftening;
-
     procedure SoftenShadowsList(aIdList: TList<Integer>);
+    {$ENDIF}
     procedure SoftenShadowsRange(aFrom, aTo: Integer; aOnlyShadows: Boolean = True);
 
     procedure DetermineImagesObjectSizeAll;
@@ -225,7 +226,8 @@ uses
   StrUtils,
   {$ENDIF}
   KromUtils,
-  KM_SoftShadows, KM_Resource, KM_ResUnits,
+  KM_SoftShadows, KM_ResUnits,
+  {$IFDEF WDC} KM_Resource, {$ENDIF}
   KM_Render,
   TypInfo,
   KM_Log, KM_CommonClasses,
@@ -292,6 +294,7 @@ begin
 end;
 
 
+{$IFDEF WDC}
 function TKMSpritePack.GetSoftenShadowType(aID: Integer): TKMSpriteSoftening;
 var
   step, spriteID: Integer;
@@ -366,6 +369,8 @@ begin
 end;
 
 
+{$ENDIF}
+
 // Make old style KaM checkerboard shadows smooth and transparent
 procedure TKMSpritePack.SoftenShadowsRange(aFrom, aTo: Integer; aOnlyShadows: Boolean = True);
 var
@@ -955,6 +960,7 @@ end;
 
 procedure TKMSpritePack.OverloadGeneratedFromFolder(aAlphaShadows: Boolean; const aFolder: string; aSoftenShadows: Boolean = True;
                                                     aOnCheckTerminated: TBooleanFuncSimple = nil);
+  {$IFDEF WDC}
   // Append all PNGs including the subfolders
   // Pattern is X_nnnn.png, where nnnn is dynamic (1..n chars) for modders convenience
   procedure AppendFolder(idList: TList<Integer>);
@@ -989,6 +995,7 @@ procedure TKMSpritePack.OverloadGeneratedFromFolder(aAlphaShadows: Boolean; cons
       fileList.Free;
     end;
   end;
+  {$ENDIF}
 
 var
   idList: TList<Integer>;
@@ -1012,7 +1019,7 @@ end;
 // Parse all valid files in Sprites folder:
 // - append or replace original sprites with new ones
 // - exclude original sprites if necessary as well
-procedure TKMSpritePack.OverloadRXDataFromFolder(const aFolder: string; aOnProgress: TProc<string>; aSoftenShadows: Boolean = True);
+procedure TKMSpritePack.OverloadRXDataFromFolder(const aFolder: string; aOnProgress: {$IFDEF FPC}TUnicodeStringEvent{$ELSE}TProc<string>{$ENDIF}; aSoftenShadows: Boolean = True);
   {$IFDEF WDC}
   // Append all PNGs including the subfolders
   // Pattern is X_nnnn.png, where nnnn is dynamic (1..n chars) for modders convenience