LCL Carbon: moved AGL to LCL Carbon interface

git-svn-id: trunk@17294 -

.gitattributes

@@ -972,7 +972,6 @@ components/mouseandkeyinput/winmouseinput.pas svneol=native#text/pascal
 components/mouseandkeyinput/xkeyinput.pas svneol=native#text/pascal
 components/mouseandkeyinput/xmouseinput.pas svneol=native#text/pascal
 components/mpaslex/mpaslex.pp svneol=native#text/pascal
-components/opengl/agl.pp svneol=native#text/plain
 components/opengl/example/mainunit.lfm svneol=native#text/plain
 components/opengl/example/mainunit.lrs svneol=native#text/plain
 components/opengl/example/mainunit.pas svneol=native#text/plain
@@ -3491,6 +3490,7 @@ lcl/inipropstorage.pas svneol=native#text/pascal
 lcl/interfacebase.pp svneol=native#text/pascal
 lcl/interfaces/LAYOUT.txt svneol=native#text/plain
 lcl/interfaces/carbon/README.txt svneol=native#text/plain
+lcl/interfaces/carbon/agl.pp svneol=native#text/plain
 lcl/interfaces/carbon/carbonbars.pp svneol=native#text/pascal
 lcl/interfaces/carbon/carbonbuttons.pp svneol=native#text/pascal
 lcl/interfaces/carbon/carboncanvas.pp svneol=native#text/pascal

components/opengl/glcarbonaglcontext.pas

@@ -16,18 +16,13 @@
 unit GLCarbonAGLContext;
 
 {$mode objfpc}{$H+}
-{$linkframework AGL}
 
 interface
 
 uses
   Classes, SysUtils, LCLProc, LCLType, gl, Forms,
-{$ifdef ver2_2_0}
-  FPCMacOSAll,
-{$else}
   MacOSAll,
-{$endif}
-  CarbonInt, AGL, CarbonProc, CarbonDef, CarbonPrivate,
+  AGL, CarbonProc, CarbonDef, CarbonPrivate,
   WSLCLClasses, CarbonWSControls, CarbonUtils,
   Controls;
 

components/opengl/lazopenglcontext.lpk

@@ -2,19 +2,19 @@
 <CONFIG>
   <Package Version="3">
     <Name Value="LazOpenGLContext"/>
+    <Author Value="Mattias Gaertner"/>
     <CompilerOptions>
-      <Version Value="5"/>
+      <Version Value="8"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
       <Other>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
-    <Files Count="5">
+    <Description Value="Simple cross-platform OpenGL viewer control"/>
+    <Version Release="1"/>
+    <Files Count="4">
       <Item1>
         <Filename Value="openglcontext.pas"/>
         <HasRegisterProc Value="True"/>
@@ -31,15 +31,10 @@
         <UnitName Value="GLCarbonAGLContext"/>
       </Item3>
       <Item4>
-        <Filename Value="agl.pp"/>
-        <AddToUsesPkgSection Value="False"/>
-        <UnitName Value="agl"/>
-      </Item4>
-      <Item5>
         <Filename Value="glwin32wglcontext.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="GLWin32WGLContext"/>
-      </Item5>
+      </Item4>
     </Files>
     <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="2">
@@ -52,7 +47,7 @@
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)"/>
+      <UnitPath Value="$(PkgOutDir)/"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>

lcl/interfaces/carbon/agl.pp

@@ -1,6 +1,11 @@
 unit agl;
 
-{$MODE objfpc}
+{$ifdef fpc}
+  {$mode objfpc}
+  {$Packrecords C}
+  {$calling cdecl}
+  {$linkframework AGL}
+{$endif}
 
 interface
 
@@ -17,10 +22,6 @@ PGLenum  = ^GLenum;
 PGLint  = ^GLint;
 PGLubyte  = ^GLubyte;
 PGLvoid  = ^GLvoid;}
-{$IFDEF FPC}
-{$PACKRECORDS C}
-{$ENDIF}
-
 
 {
 ** AGL API version.

lcl/interfaces/carbon/carbonint.pas

@@ -51,7 +51,7 @@ uses
   {$ifdef DebugBitmaps}
     CarbonDebug,
   {$endif}
-  glgrab,
+  glgrab, agl,
   // LCL
   LCLStrConsts, LMessages, LCLMessageGlue, LCLProc, LCLIntf, LCLType, IntfGraphics,
   GraphType, GraphMath, Graphics, Controls, Forms, Dialogs, Menus, Maps, Themes;