From 3158ee2b850ce0311d8cb8f03cbe6b1681a1f48f Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 9 Jun 2008 10:22:14 +0000
Subject: - all references to the libc unit removed. The Libc unit (not the
 library) was for kylix compatibility and should not be used anymore. In
 addition it seems the libc unit is not available on 64bit systems. - added
 some functions that will be introduced with FPC 2.2.2

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1145 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/lib/JEDI-SDL/OpenGL-Set8087CW.patch   | 54 -------------------------
 Game/Code/lib/JEDI-SDL/SDL/Pas/moduleloader.pas |  9 +++--
 Game/Code/lib/JEDI-SDL/moduleloader-libc.patch  | 25 ++++++++++++
 3 files changed, 30 insertions(+), 58 deletions(-)
 create mode 100644 Game/Code/lib/JEDI-SDL/moduleloader-libc.patch

(limited to 'Game/Code/lib/JEDI-SDL')

diff --git a/Game/Code/lib/JEDI-SDL/OpenGL-Set8087CW.patch b/Game/Code/lib/JEDI-SDL/OpenGL-Set8087CW.patch
index aeebeee5..e08ca63e 100644
--- a/Game/Code/lib/JEDI-SDL/OpenGL-Set8087CW.patch
+++ b/Game/Code/lib/JEDI-SDL/OpenGL-Set8087CW.patch
@@ -14,57 +14,3 @@ Index: OpenGL/Pas/gl.pas
  
    LoadOpenGL( GLLibName );
  
-Index: OpenGL/Pas/opengl12.pas
-===================================================================
---- OpenGL/Pas/opengl12.pas	(revision 961)
-+++ OpenGL/Pas/opengl12.pas	(working copy)
-@@ -7125,16 +7125,15 @@
- 
- //----------------------------------------------------------------------------------------------------------------------
- 
--{$ifndef VER140}
-+// RaiseLastOSError did not exist in Delphi 5
-+{$ifdef VER130}
- 
- procedure RaiseLastOSError;
- begin
--  {$ifndef FPC}
-   RaiseLastWin32Error;
--  {$endif}
- end;
- 
--{$endif VER140}
-+{$endif}
- 
- //----------------------------------------------------------------------------------------------------------------------
- 
-@@ -9948,21 +9947,16 @@
- end; 
- 
- //----------------------------------------------------------------------------------------------------------------------
--{$ifdef FPC}
--const Default8087CW: Word = $1332;
- 
--{$ASMMODE INTEL}
--procedure Set8087CW(NewCW: Word); Assembler;
--asm
--  MOV Default8087CW, AX
--end;
--{$endif}
--
--//----------------------------------------------------------------------------------------------------------------------
--
- initialization
--  ContextList := TThreadList.Create; 
--  Set8087CW($133F); 
-+  ContextList := TThreadList.Create;
-+  {$IF Defined(CPU386) or Defined(CPUI386) or Defined(CPUX86_64)}
-+  // FPC has its own implementation of Set8087CW now. The wrongly
-+  // coded (the important asm-directives were missing so it was not of any use!!!)
-+  // implementation was removed from this unit so it does not hide the correct FPC version anymore.
-+  // This should fix some EDivByZero exceptions in floating-point expressions.
-+  Set8087CW($133F);
-+  {$IFEND}
- finalization
-   CloseOpenGL; 
-   ContextList.Free; 
diff --git a/Game/Code/lib/JEDI-SDL/SDL/Pas/moduleloader.pas b/Game/Code/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
index 56863ea5..ea4f220c 100644
--- a/Game/Code/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
+++ b/Game/Code/lib/JEDI-SDL/SDL/Pas/moduleloader.pas
@@ -185,15 +185,16 @@ end;
 
 {$IFDEF Unix}
 uses
-{$ifdef Linux}
-  Types,
-  Libc;
-{$else}
+{$ifdef FPC}
   dl,
   Types,
   Baseunix,
   Unix;
+{$else}
+  Types,
+  Libc;
 {$endif}
+
 type
   // Handle to a loaded .so
   TModuleHandle = Pointer;
diff --git a/Game/Code/lib/JEDI-SDL/moduleloader-libc.patch b/Game/Code/lib/JEDI-SDL/moduleloader-libc.patch
new file mode 100644
index 00000000..02255db0
--- /dev/null
+++ b/Game/Code/lib/JEDI-SDL/moduleloader-libc.patch
@@ -0,0 +1,25 @@
+Index: SDL/Pas/moduleloader.pas
+===================================================================
+--- SDL/Pas/moduleloader.pas	(revision 1144)
++++ SDL/Pas/moduleloader.pas	(working copy)
+@@ -185,15 +185,16 @@
+ 
+ {$IFDEF Unix}
+ uses
+-{$ifdef Linux}
+-  Types,
+-  Libc;
+-{$else}
++{$ifdef FPC}
+   dl,
+   Types,
+   Baseunix,
+   Unix;
++{$else}
++  Types,
++  Libc;
+ {$endif}
++
+ type
+   // Handle to a loaded .so
+   TModuleHandle = Pointer;
-- 
cgit v1.2.3