Changeset 369 for trunk

Timestamp:

Apr 14, 2021, 3:49:11 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Build under Windows. fpAsync and fpSock are not supported under Windows. Networking needs to be replaced by something else multi-platform.

Location:

trunk/Network

Files:

• UNetworkClient.pas (modified) (5 diffs)
• UNetworkServer.pas (modified) (5 diffs)

trunk/Network/UNetworkClient.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, fpsock, fpAsync, Protocol;
+  Classes, SysUtils{$IFDEF LINUX}, fpAsync, fpsock{$ENDIF}, Protocol;
 
+{$IFDEF LINUX}
 type
   { TTCPClientThread }
@@ -39 +40 @@
 var
   NetworkClient: TNetworkClient;
+{$ENDIF}
 
 procedure Client(Command, Player: Integer; var Data); stdcall;
@@ -48 +50 @@
   LocalPlayer, Global, UNetworkCommon;
 
-function LocalServer(Command, Player, Subject: Integer; var Data): Integer; stdcall;
-begin
-  if Assigned(NetworkClient) then
-    Result := NetworkClient.Server(TCommand(Command), Player, Subject, Data);
-end;
-
 procedure Client(Command, Player: Integer; var Data);
 var
   Cmd: TCommand;
 begin
+  {$IFDEF LINUX}
   Cmd := TCommand(Command);
   case Cmd of
@@ -71 +68 @@
     end;
   end;
+  {$ENDIF}
+end;
+
+{$IFDEF LINUX}
+function LocalServer(Command, Player, Subject: Integer; var Data): Integer; stdcall;
+begin
+  if Assigned(NetworkClient) then
+    Result := NetworkClient.Server(TCommand(Command), Player, Subject, Data);
 end;
 
@@ -167 +172 @@
   inherited;
 end;
+{$ENDIF}
 
 end.

trunk/Network/UNetworkServer.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, fgl, fpAsync, fpsock, Protocol, fphttpclient;
-
+  Classes, SysUtils, fgl{$IFDEF LINUX}, fpAsync, fpsock{$ENDIF}, Protocol, fphttpclient;
+
+{$IFDEF LINUX}
 type
   TNetworkServer = class;
@@ -79 +80 @@
 var
   NetworkServer: TNetworkServer;
+{$ENDIF}
 
 procedure Client(Command, Player: integer; var Data); stdcall;
@@ -90 +92 @@
 procedure Client(Command, Player: integer; var Data);
 begin
+  {$IFDEF LINUX}
   if not Assigned(NetworkServer) then begin
     NetworkServer := TNetworkServer.Create;
@@ -99 +102 @@
   end;
   NetworkServer.Client(TCommand(Command), Player, Data);
-end;
+  {$ENDIF}
+end;
+
+{$IFDEF LINUX}
 
 { TNetworkServerPlayers }
@@ -327 +333 @@
 end;
 
+{$ENDIF}
+
 end.