浏览代码

* sdl only depends on pthreads and x11 on unices. (better fix for r19980, bug #21034)

git-svn-id: trunk@19981 -
joost 13 年之前
父节点
当前提交
c8ea08a5bd
共有 1 个文件被更改,包括 3 次插入7 次删除
  1. 3 7
      packages/sdl/fpmake.pp

+ 3 - 7
packages/sdl/fpmake.pp

@@ -4,10 +4,6 @@ program fpmake;
 
 
 uses fpmkunit;
 uses fpmkunit;
 
 
-const
-  SDLUtilsOSes  = [linux,freebsd,win32,darwin,iphonesim];
-  SDLUtilsProcs = [i386,powerpc];
-
 Var
 Var
   P : TPackage;
   P : TPackage;
   T : TTarget;
   T : TTarget;
@@ -23,8 +19,8 @@ begin
     P.Version:='2.7.1';
     P.Version:='2.7.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
-    P.Dependencies.Add('x11',SDLUtilsProcs,SDLUtilsOSes);
-    P.Dependencies.Add('pthreads',SDLUtilsProcs,SDLUtilsOSes);
+    P.Dependencies.Add('x11',AllUnixOSes);
+    P.Dependencies.Add('pthreads',AllUnixOSes);
 
 
     T:=P.Targets.AddUnit('logger.pas');
     T:=P.Targets.AddUnit('logger.pas');
       with T.Dependencies do
       with T.Dependencies do
@@ -73,7 +69,7 @@ begin
           AddInclude('jedi-sdl.inc');
           AddInclude('jedi-sdl.inc');
           AddUnit('sdl');
           AddUnit('sdl');
         end;
         end;
-    T:=P.Targets.AddUnit('sdlutils.pas',SDLUtilsProcs,SDLUtilsOSes);
+    T:=P.Targets.AddUnit('sdlutils.pas',[i386,powerpc],[linux,freebsd,win32,darwin,iphonesim]);
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
           AddInclude('jedi-sdl.inc');
           AddInclude('jedi-sdl.inc');