* Some fpmake fixes for windows

git-svn-id: trunk@18076 -

packages/fcl-extra/fpmake.pp

@@ -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);

packages/fcl-process/fpmake.pp

@@ -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');

packages/fcl-xml/fpmake.pp

@@ -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');

packages/winunits-jedi/fpmake.pp

@@ -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';