Quellcode durchsuchen

* Dotted filenames for package opengles

Michaël Van Canneyt vor 2 Jahren
Ursprung
Commit
c357977a1e

+ 3 - 0
packages/opengles/namespaced/Api.OpenGL.Gles11.pp

@@ -0,0 +1,3 @@
+unit Api.OpenGL.Gles11;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gles11.pp}

+ 3 - 0
packages/opengles/namespaced/Api.OpenGL.Gles20.pas

@@ -0,0 +1,3 @@
+unit Api.OpenGL.Gles20;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gles20.pas}

+ 4 - 0
packages/opengles/namespaces.lst

@@ -0,0 +1,4 @@
+src/gles11.pp=namespaced/Api.OpenGL.Gles11.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/gles20.pas=namespaced/Api.OpenGL.Gles20.pas

+ 12 - 0
packages/opengles/src/gles11.pp

@@ -1,10 +1,17 @@
 
 {$mode objfpc}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gles11;
+{$ENDIF FPC_DOTTEDUNITS}
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
   Automatically converted by H2Pas 1.0.0 from gles.h
@@ -834,8 +841,13 @@ uses
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+  uses
+    System.SysUtils, System.DynLibs, System.Math;
+{$ELSE FPC_DOTTEDUNITS}
   uses
     sysutils, dynlibs, math;
+{$ENDIF FPC_DOTTEDUNITS}
 
   var
     hlib : tlibhandle;

+ 17 - 3
packages/opengles/src/gles20.pas

@@ -31,7 +31,9 @@
  ** This document is licensed under the SGI Free Software B License Version
  ** 2.0. For details, see http://oss.sgi.com/projects/FreeB/ 
  **}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gles20;
+{$ENDIF FPC_DOTTEDUNITS}
 {$mode objfpc}
 {$ifdef linux}
   {$define EGL}
@@ -44,7 +46,19 @@ unit gles20;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses 
+  System.SysUtils,System.DynLibs
+  {$ifdef X}
+    ,Api.X11.X,Api.X11.Xlib
+  {$endif}
+  {$ifdef Windows}
+    ,WinApi.Windows
+  {$endif}
+  ;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils,dynlibs{$ifdef X},x,xlib{$endif}{$ifdef windows},Windows{$endif};
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
 {$PACKRECORDS C}
@@ -1373,7 +1387,7 @@ implementation
 
   function glGetProcAddress(ahlib:tlibhandle;ProcName:PAnsiChar):pointer;
     begin
-      result:=dynlibs.GetProcAddress(ahlib,ProcName);
+      result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}dynlibs.GetProcAddress(ahlib,ProcName);
 {$ifdef EGL}
       if assigned(eglGetProcAddress) and not assigned(result) then
         result:=eglGetProcAddress(ProcName);
@@ -1473,7 +1487,7 @@ implementation
   procedure LoadEGL(lib : PAnsiChar);
     begin
       FreeEGL;
-      EGLLib:=dynlibs.LoadLibrary(lib);
+      EGLLib:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}dynlibs.LoadLibrary(lib);
       if EGLLib=0 then
         raise Exception.Create(format('Could not load library: %s',[lib]));
 
@@ -1695,7 +1709,7 @@ implementation
   procedure LoadGLESv2(lib : PAnsiChar);
     begin
       FreeGLESv2;
-      GLESv2Lib:=dynlibs.LoadLibrary(lib);
+      GLESv2Lib:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}dynlibs.LoadLibrary(lib);
       if GLESv2Lib=0 then
         raise Exception.Create(format('Could not load library: %s',[lib]));