--- Merging r32143 into '.':

U    packages/hash/fpmake.pp
--- Recording mergeinfo for merge of r32143 into '.':
 U   .
--- Merging r32144 into '.':
U    packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r32144 into '.':
 G   .
--- Merging r32145 into '.':
U    packages/fcl-registry/fpmake.pp
--- Recording mergeinfo for merge of r32145 into '.':
 G   .
--- Merging r32146 into '.':
U    packages/gtk2/fpmake.pp
--- Recording mergeinfo for merge of r32146 into '.':
 G   .
--- Merging r32147 into '.':
U    packages/winunits-jedi/fpmake.pp
--- Recording mergeinfo for merge of r32147 into '.':
 G   .

# revisions: 32143,32144,32145,32146,32147

git-svn-id: branches/fixes_3_0@32243 -

packages/fcl-registry/fpmake.pp

@@ -35,7 +35,8 @@ begin
       with T.Dependencies do
         begin
           AddInclude('regdef.inc');
-          AddInclude('xregreg.inc');
+          AddInclude('winreg.inc',AllWindowsOSes);
+          AddInclude('xregreg.inc',AllOSes-AllWindowsOSes);
           AddInclude('regini.inc');
           AddUnit('xmlreg');
         end;

packages/gtk2/fpmake.pp

@@ -441,6 +441,7 @@ begin
           AddInclude('gmarshal.inc');
           AddInclude('gincludes.inc');
           AddInclude('goption.inc');
+          AddInclude('gwin32.inc',AllWindowsOSes);
         end;
     T:=P.Targets.AddImplicitUnit('src/gtk+/gtk/gtk2.pas');
       T.IncludePath.Add('src/gtk+/gtk');

packages/hash/fpmake.pp

@@ -28,7 +28,9 @@ begin
 
     P.Version:='3.0.1';
     T:=P.Targets.AddUnit('src/md5.pp');
+    T.Dependencies.AddInclude('src/md5i386.inc', [i386], AllOSes-[darwin]);
     T:=P.Targets.AddUnit('src/sha1.pp');
+    T.Dependencies.AddInclude('src/sha1i386.inc', [i386], AllOSes-[darwin]);
     T:=P.Targets.AddUnit('src/crc.pas');
     T:=P.Targets.AddUnit('src/ntlm.pas');
     T:=P.Targets.AddUnit('src/uuid.pas');

packages/rtl-extra/fpmake.pp

@@ -77,6 +77,7 @@ begin
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/$(OS)');
     P.IncludePath.Add('src/darwin',[iphonesim]);
+    P.IncludePath.Add('src/win',AllWindowsOSes);
 
     T:=P.Targets.AddUnit('ucomplex.pp',UComplexOSes);
 
@@ -109,6 +110,7 @@ begin
      begin
        addinclude('osdefs.inc',AllUnixOSes);
        addinclude('socketsh.inc');
+       addinclude('fpwinsockh.inc',AllWindowsOSes);
        addinclude('sockets.inc');
        addinclude('sockovl.inc');
        addinclude('unxsockh.inc',UnixLikes);

packages/winunits-jedi/fpmake.pp

@@ -257,6 +257,9 @@ begin
     // Build unit depending on all implicit units
     TBuild:=P.Targets.AddUnit('buildjwa.pp');
       TBuild.Install:=False;
+      TBuild.Dependencies.AddInclude('src/jediapilib.inc');
+      TBuild.Dependencies.AddInclude('src/jedi.inc');
+      TBuild.Dependencies.AddInclude('src/ModuleLoader.pas');
       For I:=0 to P.Targets.Count-1 do
         begin
           T:=P.Targets.TargetItems[I];