From 221ad24074c386a57498a70d9d9794330a2757ac Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 18 May 2010 08:15:32 +0000
Subject: [PATCH] Patch from Graeme to improve epiktimer

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1223 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/epiktimer/epiktimer.pas | 21 ++----------------
 components/epiktimer/etpackage.lpk | 35 ++++++++++--------------------
 components/epiktimer/etpackage.pas |  9 +-------
 3 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/components/epiktimer/epiktimer.pas b/components/epiktimer/epiktimer.pas
index 7c4ca77e5..6b0ebcaa7 100644
--- a/components/epiktimer/epiktimer.pas
+++ b/components/epiktimer/epiktimer.pas
@@ -70,12 +70,9 @@ uses
 {$IFDEF Windows}
   Windows, MMSystem,
 {$ELSE}
-  baseunix, unix, unixutil,
+  unix, unixutil,
 {$ENDIF}
-{$IFDEF FPC}
-  LResources,
-{$ENDIF}
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, dateutils;
+  Classes, SysUtils, dateutils;
 
 Const
   DefaultSystemTicksPerSecond = 1000000; //Divisor for microsecond resolution
@@ -279,7 +276,6 @@ type
       property CorrelationMode:CorrelationModes read FCorrelationMode write FCorrelationMode;
   end;
 
-procedure Register;
 
 implementation
 
@@ -785,18 +781,5 @@ begin
   // here in case we need to clean something up in a later version
 end;
 
-(* * * * * * * * * * * Register Component  * * * * * * * * * * * *)
-
-procedure Register;
-begin
-  RegisterComponents('System', [TEpikTimer]);
-end;
-
-Initialization
-
-{$IFDEF FPC}
-  {$I epiktimer.lrs}
-{$ENDIF}
-
 end.
 
diff --git a/components/epiktimer/etpackage.lpk b/components/epiktimer/etpackage.lpk
index eec5ea436..ecf155cf6 100644
--- a/components/epiktimer/etpackage.lpk
+++ b/components/epiktimer/etpackage.lpk
@@ -1,47 +1,34 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="2">
+  <Package Version="3">
     <Name Value="etpackage"/>
     <Author Value="Tom Lisjac <netdxr@gmail.com>"/>
     <CompilerOptions>
-      <Version Value="5"/>
+      <Version Value="8"/>
       <SearchPaths>
-        <OtherUnitFiles Value="$(LazarusDir)/lcl/units/"/>
-        <UnitOutputDirectory Value="lib"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
       </SearchPaths>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
       <Other>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
     <Description Value="EpikTimer elapsed time component
-  http://wiki.lazarus.freepascal.org/EpikTimer
+http://wiki.lazarus.freepascal.org/EpikTimer
 "/>
-    <License Value="Modifyed LGPL
+    <License Value="Modified LGPL
 "/>
-    <Version Major="1"/>
-    <Files Count="2">
+    <Version Major="1" Build="1"/>
+    <Files Count="1">
       <Item1>
-        <Filename Value="epiktimer.lrs"/>
-        <Type Value="LRS"/>
-      </Item1>
-      <Item2>
         <Filename Value="epiktimer.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="EpikTimer"/>
-      </Item2>
-    </Files>
-    <Type Value="RunAndDesignTime"/>
-    <RequiredPkgs Count="2">
-      <Item1>
-        <PackageName Value="LCL"/>
       </Item1>
-      <Item2>
+    </Files>
+    <RequiredPkgs Count="1">
+      <Item1>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item2>
+      </Item1>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)/"/>
diff --git a/components/epiktimer/etpackage.pas b/components/epiktimer/etpackage.pas
index 0ebe5c964..93336acef 100644
--- a/components/epiktimer/etpackage.pas
+++ b/components/epiktimer/etpackage.pas
@@ -7,15 +7,8 @@ unit etpackage;
 interface
 
 uses
-  EpikTimer, LazarusPackageIntf; 
+  EpikTimer; 
 
 implementation
 
-procedure Register; 
-begin
-  RegisterUnit('EpikTimer', @EpikTimer.Register); 
-end; 
-
-initialization
-  RegisterPackage('etpackage', @Register); 
 end.