From 6ae49f6c74e8db7de08d5769d2720b3cf416d4d6 Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Wed, 3 Aug 2011 15:32:15 +0000
Subject: [PATCH]  * Some fpmake fixes for windows

git-svn-id: trunk@18076 -
---
 packages/fcl-extra/fpmake.pp     | 1 +
 packages/fcl-process/fpmake.pp   | 4 ++--
 packages/fcl-xml/fpmake.pp       | 7 ++++++-
 packages/winunits-jedi/fpmake.pp | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/fcl-extra/fpmake.pp b/packages/fcl-extra/fpmake.pp
index 112a1f4ab9..0c6dbe6569 100644
--- a/packages/fcl-extra/fpmake.pp
+++ b/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);
diff --git a/packages/fcl-process/fpmake.pp b/packages/fcl-process/fpmake.pp
index 8a18fde7e7..5c296412cc 100644
--- a/packages/fcl-process/fpmake.pp
+++ b/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');
diff --git a/packages/fcl-xml/fpmake.pp b/packages/fcl-xml/fpmake.pp
index a638448847..037bbc60da 100644
--- a/packages/fcl-xml/fpmake.pp
+++ b/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');
diff --git a/packages/winunits-jedi/fpmake.pp b/packages/winunits-jedi/fpmake.pp
index 9d823815ae..f21e7cf64f 100644
--- a/packages/winunits-jedi/fpmake.pp
+++ b/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';