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

git-svn-id: trunk@19981 -
This commit is contained in:
joost 2012-01-06 15:09:24 +00:00
parent 6cd4bded69
commit c8ea08a5bd

View File

@ -4,10 +4,6 @@ program fpmake;
uses fpmkunit;
const
SDLUtilsOSes = [linux,freebsd,win32,darwin,iphonesim];
SDLUtilsProcs = [i386,powerpc];
Var
P : TPackage;
T : TTarget;
@ -23,8 +19,8 @@ begin
P.Version:='2.7.1';
P.SourcePath.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');
with T.Dependencies do
@ -73,7 +69,7 @@ begin
AddInclude('jedi-sdl.inc');
AddUnit('sdl');
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
begin
AddInclude('jedi-sdl.inc');