From 5501cc7b2b4c2216e713d623ad27d147880dbd45 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Thu, 23 Feb 2012 23:21:19 +0000
Subject: [PATCH]  * Fix file warnings for win32

git-svn-id: trunk@20420 -
---
 packages/fcl-net/fpmake.pp |  2 +-
 packages/hermes/fpmake.pp  | 22 +++++++++++-----------
 packages/libxml/fpmake.pp  |  1 +
 packages/opengl/fpmake.pp  |  2 +-
 packages/ptc/fpmake.pp     |  6 +++++-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packages/fcl-net/fpmake.pp b/packages/fcl-net/fpmake.pp
index e2e6133e07..30ebab2473 100644
--- a/packages/fcl-net/fpmake.pp
+++ b/packages/fcl-net/fpmake.pp
@@ -41,7 +41,7 @@ begin
       with T.Dependencies do
         begin
           AddInclude('resolve.inc');
-          AddUnit('netdb');
+          AddUnit('netdb',AllUnixOSes);
         end;
     T.ResourceStrings := True;
     T:=P.Targets.AddUnit('ssockets.pp',AllUnixOSes+AllWindowsOSes+[OS2,EMX]);
diff --git a/packages/hermes/fpmake.pp b/packages/hermes/fpmake.pp
index 09c86c05cd..002e608168 100644
--- a/packages/hermes/fpmake.pp
+++ b/packages/hermes/fpmake.pp
@@ -34,9 +34,9 @@ T:=P.Targets.AddUnit('hermes.pp');
     begin
       AddInclude('hermdef.inc');
       AddInclude('hermconf.inc');
-      AddInclude('malloc.inc');
-      AddInclude('debug.inc');
-      AddInclude('dither.inc');
+      // AddInclude('malloc.inc');
+      AddInclude('hermes_debug.inc');
+      AddInclude('hermes_dither.inc');
       AddInclude('headp.inc');
       AddInclude('p_16.inc');
       AddInclude('p_24.inc');
@@ -53,15 +53,15 @@ T:=P.Targets.AddUnit('hermes.pp');
       AddInclude('p_muhmu.inc');
       AddInclude('d_32.inc');
       AddInclude('headi386.inc',[i386],AllOSes);
-      AddInclude('headmmx.inc',[i386],AllOSes); 
+      AddInclude('headmmx.inc',[i386],AllOSes);
       AddInclude('factconv.inc');
-      AddInclude('list.inc');
-      AddInclude('utility.inc');
-      AddInclude('format.inc');
-      AddInclude('palette.inc');
-      AddInclude('convert.inc');
-      AddInclude('clear.inc');
-      AddInclude('factory.inc');
+      AddInclude('hermes_list.inc');
+      AddInclude('hermes_utility.inc');
+      AddInclude('hermes_format.inc');
+      AddInclude('hermes_palette.inc');
+      AddInclude('hermes_converter.inc');
+      AddInclude('hermes_clearer.inc');
+      AddInclude('hermes_factory.inc');
    end;
 
 
diff --git a/packages/libxml/fpmake.pp b/packages/libxml/fpmake.pp
index 8809de96f0..421b71102a 100644
--- a/packages/libxml/fpmake.pp
+++ b/packages/libxml/fpmake.pp
@@ -19,6 +19,7 @@ begin
     P.Version:='2.7.1';
     P.OSes := [freebsd,linux,win32];
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
   T:=P.Targets.AddUnit('xml2.pas');
   with T.Dependencies do
diff --git a/packages/opengl/fpmake.pp b/packages/opengl/fpmake.pp
index 7db4f53693..bbe7aa0b44 100644
--- a/packages/opengl/fpmake.pp
+++ b/packages/opengl/fpmake.pp
@@ -31,7 +31,7 @@ begin
     T:=P.Targets.AddUnit('gl.pp');
     T:=P.Targets.AddUnit('glu.pp');
     T:=P.Targets.AddUnit('glut.pp');
-    T.Dependencies.Add('freeglut',AllOSes-[morphos]);
+    // T.Dependencies.Add('freeglut',AllOSes-[morphos]);
     T:=P.Targets.AddUnit('glx.pp',AllUnixOSes-[darwin,iphonesim]);
     if Defaults.CPU<>arm then
       T:=P.Targets.AddUnit('glx.pp',[darwin]);
diff --git a/packages/ptc/fpmake.pp b/packages/ptc/fpmake.pp
index 4530371862..7da3ed199a 100644
--- a/packages/ptc/fpmake.pp
+++ b/packages/ptc/fpmake.pp
@@ -22,8 +22,9 @@ begin
     p.OSes:=[linux,win32,win64];
     P.SourcePath.Add('src');
     P.SourcePath.Add('src/ptcwrapper');
-    P.SourcePath.Add('src/win32/directx', [win32, win64]); 
+    P.SourcePath.Add('src/win32/directx', [win32, win64]);
     P.IncludePath.Add('src');
+    P.IncludePath.Add('src/core');
     P.IncludePath.Add('src/dos',[go32v2]);
     P.IncludePath.Add('src/dos/base',[go32v2]);
     P.SourcePath.Add('src/dos/cga',[go32v2]);
@@ -37,6 +38,9 @@ begin
     P.IncludePath.Add('src/dos/timeunit',[go32v2]);
     P.IncludePath.Add('src/dos/vesa',[go32v2]);
     P.IncludePath.Add('src/win32',[win32,win64]);
+    P.IncludePath.Add('src/win32/base', [win32, win64]);
+    P.IncludePath.Add('src/win32/directx', [win32, win64]);
+    P.IncludePath.Add('src/win32/gdi', [win32, win64]);
     P.IncludePath.Add('src/wince',[wince]);
     P.IncludePath.Add('src/x11',AllUnixOSes);