* new fpmake style for sdl

git-svn-id: trunk@9835 -

.gitattributes

@@ -3370,7 +3370,6 @@ packages/extra/sdl/LGPL.addon -text
 packages/extra/sdl/MPL-1.1 -text
 packages/extra/sdl/Makefile.fpc -text
 packages/extra/sdl/README -text
-packages/extra/sdl/fpmake.inc svneol=native#text/plain
 packages/extra/sdl/fpmake.pp svneol=native#text/plain
 packages/extra/sdl/jedi-sdl.inc svneol=native#text/plain
 packages/extra/sdl/libxmlparser.pas svneol=native#text/plain

packages/extra/sdl/fpmake.inc

@@ -1,20 +0,0 @@
-    StartPackage('sdl');
-    {$IF defined(ALLPACKAGES)}
-    Directory:='extra/sdl';
-    {$ELSEIF defined(EXTRAPACKAGES)}
-    Directory:='sdl';
-    {$ENDIF}
-    OS:=[linux,freebsd,win32,win64,darwin];
-    Dependencies.Add('pthreads');
-    Dependencies.Add('x11');
-    Dependencies.Add('smpeg');
-    T:=Targets.AddUnit('sdl');
-    T:=Targets.AddUnit('sdl_image');
-    T:=Targets.AddUnit('sdl_mixer');
-    T:=Targets.AddUnit('sdl_mixer_nosmpeg');
-    T:=Targets.AddUnit('sdl_ttf');
-    T:=Targets.AddUnit('sdl_gfx');
-    T:=Targets.AddUnit('sdl_net');
-    T:=Targets.AddUnit('smpeg');
-    T.CPU := [I386,X86_64,PPC];
-    EndPackage;

packages/extra/sdl/fpmake.pp

@@ -1,17 +1,38 @@
+{$ifndef ALLPACKAGES}
 {$mode objfpc}{$H+}
 program fpmake;
 
 uses fpmkunit;
 
 Var
+  P : TPackage;
   T : TTarget;
-
 begin
-  With Installer do 
+  With Installer do
     begin
-    { Base packages }
-    {$i fpmake.inc}
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('sdl');
+{$ifdef ALLPACKAGES}
+    P.Directory:='sdl';
+{$endif ALLPACKAGES}
+    P.Version:='1.2.12';
+    T:=P.Targets.AddUnit('jedi-sdl.inc');
+    T:=P.Targets.AddUnit('powersdl.inc');
+    T:=P.Targets.AddUnit('sdl.pas');
+    T:=P.Targets.AddUnit('sdl_gfx.pas');
+    T:=P.Targets.AddUnit('sdl_image.pas');
+    T:=P.Targets.AddUnit('sdl_mixer.pas');
+    T:=P.Targets.AddUnit('sdl_ttf.pas');
+    T:=P.Targets.AddUnit('sdl_net.pas');
+    T:=P.Targets.AddUnit('sdl_mixer_nosmpeg.pas');
+    T:=P.Targets.AddUnit('sdlutils.pas');
+    T:=P.Targets.AddUnit('smpeg.pas');
+    T:=P.Targets.AddUnit('logger.pas');
+      T.OSes:=[linux,freebsd,win32,win64,darwin];
+
+{$ifndef ALLPACKAGES}
     Run;
     end;
 end.
-
+{$endif ALLPACKAGES}