Fixed linux compilation.

Linux is now running in the main loop fine.
*   no audio playback or input yet...
*   Timing hack inplace.. that must be replace
*   bunch of textures not working..

however the play screen is looking similar to windows builds.

I hope this dosnt break windows builds to much.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@460 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 183 insertions, 158 deletions

diff --git a/Game/Code/Classes/UCommon.pas b/Game/Code/Classes/UCommon.pas
index 8089f28c..7337751a 100644
--- a/Game/Code/Classes/UCommon.pas
+++ b/Game/Code/Classes/UCommon.pas
@@ -1,158 +1,183 @@
-unit UCommon;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

-

-uses

-{$IFDEF FPC}

-   lResources,

-{$ENDIF}   

-   ULog,

-{$IFDEF win32}

-   windows;

-{$ELSE}

-   lcltype,

-   messages;

-{$ENDIF}

-

-{$IFNDEF win32}

-type

-  hStream        = THandle;

-  HGLRC          = THandle;

-  TLargeInteger  = Int64;

-  TWin32FindData = LongInt;

-{$ENDIF}

-

-{$IFDEF FPC}

-

-type

-  TWndMethod = procedure(var Message: TMessage) of object;

-

-function LazFindResource( const aName, aType : String ): TLResource;

-

-function RandomRange(aMin: Integer; aMax: Integer) : Integer;

-

-function MaxValue(const Data: array of Double): Double;

-function MinValue(const Data: array of Double): Double;

-

-{$IFDEF Win32}

-function  AllocateHWnd(Method: TWndMethod): HWND;

-procedure DeallocateHWnd(Wnd: HWND);

-{$ENDIF}

-

-{$ENDIF}

-

-{$IFNDEF win32}

-(*

-  function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;

-  function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;

-*)

-  procedure ZeroMemory( Destination: Pointer; Length: DWORD );

-{$ENDIF}

-

-implementation

-

-{$IFNDEF win32}

-procedure ZeroMemory( Destination: Pointer; Length: DWORD );

-begin

-  FillChar( Destination^, Length, 0 );

-end; //ZeroMemory

-

-(*

-function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;

-

-  // From http://en.wikipedia.org/wiki/RDTSC

-  function RDTSC: Int64; register;

-  asm

-    rdtsc

-  end;

-

-begin

-  // Use clock_gettime  here maybe ... from libc

-  lpPerformanceCount := RDTSC();

-  result := true;

-end;

-

-function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;

-begin

-  lpFrequency := 0;

-  result := true;

-end;

-*)

-{$ENDIF}

-

-

-{$IFDEF FPC}

-

-function LazFindResource( const aName, aType : String ): TLResource;

-var

-  iCount : Integer;

-begin

-  result := nil;

-  

-  for iCount := 0 to LazarusResources.count -1 do

-  begin

-    if ( LazarusResources.items[ iCount ].Name      = aName ) AND

-       ( LazarusResources.items[ iCount ].ValueType = aType ) THEN

-    begin

-      result := LazarusResources.items[ iCount ];

-      exit;

-    end;

-  end;

-end;

-

-function MaxValue(const Data: array of Double): Double;

-var

-  I: Integer;

-begin

-  Result := Data[Low(Data)];

-  for I := Low(Data) + 1 to High(Data) do

-    if Result < Data[I] then

-      Result := Data[I];

-end;

-

-function MinValue(const Data: array of Double): Double;

-var

-  I: Integer;

-begin

-  Result := Data[Low(Data)];

-  for I := Low(Data) + 1 to High(Data) do

-    if Result > Data[I] then

-      Result := Data[I];

-end;

-

-function RandomRange(aMin: Integer; aMax: Integer) : Integer;

-begin

-RandomRange := Random(aMax-aMin) + aMin ;

-end;

-

-

-// NOTE !!!!!!!!!!

-// AllocateHWnd is in lclintfh.inc

-

-{$IFDEF Win32}

-// TODO : JB this is dodgey and bad... find a REAL solution !

-function AllocateHWnd(Method: TWndMethod): HWND;

-var

-  TempClass: TWndClass;

-  ClassRegistered: Boolean;

-begin

-  Result := CreateWindowEx(WS_EX_TOOLWINDOW, '', '', WS_POPUP , 0, 0, 0, 0, 0, 0, HInstance, nil);

-end;

-

-procedure DeallocateHWnd(Wnd: HWND);

-var

-  Instance: Pointer;

-begin

-  Instance := Pointer(GetWindowLong(Wnd, GWL_WNDPROC));

-  DestroyWindow(Wnd);

-end;

-{$ENDIF}

-

-{$ENDIF}

-

-

-end.

+unit UCommon;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+uses
+  SysUtils,
+{$IFDEF FPC}
+   lResources,
+{$ENDIF}   
+   ULog,
+{$IFDEF win32}
+   windows;
+{$ELSE}
+   lcltype,
+   messages;
+{$ENDIF}
+
+{$IFNDEF win32}
+type
+  hStream        = THandle;
+  HGLRC          = THandle;
+  TLargeInteger  = Int64;
+  TWin32FindData = LongInt;
+{$ENDIF}
+
+{$IFDEF FPC}
+
+type
+  TWndMethod = procedure(var Message: TMessage) of object;
+
+function StringReplaceW(text, search, rep: WideString):WideString;
+function AdaptFilePaths( const aPath : widestring ): widestring;
+
+function LazFindResource( const aName, aType : String ): TLResource;
+
+function RandomRange(aMin: Integer; aMax: Integer) : Integer;
+
+function MaxValue(const Data: array of Double): Double;
+function MinValue(const Data: array of Double): Double;
+
+{$IFDEF Win32}
+function  AllocateHWnd(Method: TWndMethod): HWND;
+procedure DeallocateHWnd(Wnd: HWND);
+{$ENDIF}
+
+{$ENDIF}
+
+{$IFNDEF win32}
+(*
+  function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;
+  function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;
+*)
+  procedure ZeroMemory( Destination: Pointer; Length: DWORD );
+{$ENDIF}
+
+implementation
+
+function StringReplaceW(text, search, rep: WideString):WideString;
+var
+  iPos  : integer;
+  sTemp : WideString;
+begin
+  result := text;
+  iPos   := Pos(search, result);
+  while (iPos > 0) do
+  begin
+    sTEmp := copy(result, iPos + length(search), length(result));
+    result := copy(result, 1, iPos - 1) + rep + sTEmp;
+    iPos := Pos(search, result);
+  end;
+end;
+
+function AdaptFilePaths( const aPath : widestring ): widestring;
+begin
+  result := StringReplaceW( aPath, '\', PathDelim );//, [rfReplaceAll] );
+end;
+
+
+{$IFNDEF win32}
+procedure ZeroMemory( Destination: Pointer; Length: DWORD );
+begin
+  FillChar( Destination^, Length, 0 );
+end; //ZeroMemory
+
+(*
+function QueryPerformanceCounter(lpPerformanceCount:TLARGEINTEGER):Bool;
+
+  // From http://en.wikipedia.org/wiki/RDTSC
+  function RDTSC: Int64; register;
+  asm
+    rdtsc
+  end;
+
+begin
+  // Use clock_gettime  here maybe ... from libc
+  lpPerformanceCount := RDTSC();
+  result := true;
+end;
+
+function QueryPerformanceFrequency(lpFrequency:TLARGEINTEGER):Bool;
+begin
+  lpFrequency := 0;
+  result := true;
+end;
+*)
+{$ENDIF}
+
+
+{$IFDEF FPC}
+
+function LazFindResource( const aName, aType : String ): TLResource;
+var
+  iCount : Integer;
+begin
+  result := nil;
+  
+  for iCount := 0 to LazarusResources.count -1 do
+  begin
+    if ( LazarusResources.items[ iCount ].Name      = aName ) AND
+       ( LazarusResources.items[ iCount ].ValueType = aType ) THEN
+    begin
+      result := LazarusResources.items[ iCount ];
+      exit;
+    end;
+  end;
+end;
+
+function MaxValue(const Data: array of Double): Double;
+var
+  I: Integer;
+begin
+  Result := Data[Low(Data)];
+  for I := Low(Data) + 1 to High(Data) do
+    if Result < Data[I] then
+      Result := Data[I];
+end;
+
+function MinValue(const Data: array of Double): Double;
+var
+  I: Integer;
+begin
+  Result := Data[Low(Data)];
+  for I := Low(Data) + 1 to High(Data) do
+    if Result > Data[I] then
+      Result := Data[I];
+end;
+
+function RandomRange(aMin: Integer; aMax: Integer) : Integer;
+begin
+RandomRange := Random(aMax-aMin) + aMin ;
+end;
+
+
+// NOTE !!!!!!!!!!
+// AllocateHWnd is in lclintfh.inc
+
+{$IFDEF Win32}
+// TODO : JB this is dodgey and bad... find a REAL solution !
+function AllocateHWnd(Method: TWndMethod): HWND;
+var
+  TempClass: TWndClass;
+  ClassRegistered: Boolean;
+begin
+  Result := CreateWindowEx(WS_EX_TOOLWINDOW, '', '', WS_POPUP , 0, 0, 0, 0, 0, 0, HInstance, nil);
+end;
+
+procedure DeallocateHWnd(Wnd: HWND);
+var
+  Instance: Pointer;
+begin
+  Instance := Pointer(GetWindowLong(Wnd, GWL_WNDPROC));
+  DestroyWindow(Wnd);
+end;
+{$ENDIF}
+
+{$ENDIF}
+
+
+end.