* Some fpmake fixes for windows

git-svn-id: trunk@18076 -
This commit is contained in:
joost 2011-08-03 15:32:15 +00:00
parent 043e9b2ec2
commit 6ae49f6c74
4 changed files with 10 additions and 3 deletions

View File

@ -30,6 +30,7 @@ begin
P.NeedLibC:= false;
P.SourcePath.Add('src');
P.SourcePath.Add('src/win',AllWindowsOSes);
P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
P.IncludePath.Add('src/unix',AllUnixOSes);
P.IncludePath.Add('src/win',AllWindowsOSes);

View File

@ -28,8 +28,8 @@ begin
P.SourcePath.Add('src');
P.IncludePath.Add('src/unix',AllUnixOSes);
P.IncludePath.Add('src/win',AllWindowsOSes);
P.IncludePath.Add('src/dummy',AllOSes-AllWindowsOSes-AllUnixOSes);
P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
P.IncludePath.Add('src/dummy');
T:=P.Targets.AddUnit('pipes.pp');
T.Dependencies.AddInclude('pipes.inc');
@ -39,7 +39,7 @@ begin
T:=P.Targets.AddUnit('simpleipc.pp');
T.Dependencies.AddInclude('simpleipc.inc');
T.ResourceStrings:=True;
T:=P.Targets.AddUnit('pipesipc.pp');
T:=P.Targets.AddUnit('pipesipc.pp',AllUnixOSes);
T.Dependencies.AddInclude('simpleipc.inc');
T.ResourceStrings:=True;
T:=P.Targets.AddUnit('dbugmsg.pp');

View File

@ -134,7 +134,12 @@ begin
AddUnit('dom');
AddUnit('htmldefs');
end;
T:=P.Targets.AddUnit('xmliconv.pas');
T:=P.Targets.AddUnit('xmliconv.pas',[linux,freebsd,darwin,iphonesim,haiku,beos]);
with T.Dependencies do
begin
AddUnit('xmlread');
end;
T:=P.Targets.AddUnit('xmliconv_windows.pas',[win32,win64]);
with T.Dependencies do
begin
AddUnit('xmlread');

View File

@ -19,6 +19,7 @@ begin
{$endif ALLPACKAGES}
P.Version:='2.7.1';
P.OSes:=[win32,win64];
P.Options.Add('-Ur');
P.Author := 'Marcel van Brakel, Jedi-apilib team';
P.License := 'LGPL with modification/MPL dual licensed ';
P.HomepageURL := 'www.freepascal.org';