--- Merging r18155 into '.':

U    packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r18155 into '.':
 U   .
--- Merging r18165 into '.':
U    packages/fcl-image/fpmake.pp
--- Recording mergeinfo for merge of r18165 into '.':
 G   .
--- Merging r18800 into '.':
U    packages/graph/fpmake.pp
--- Recording mergeinfo for merge of r18800 into '.':
 G   .
--- Merging r18802 into '.':
U    packages/libndsfpc/fpmake.pp
U    packages/libgbafpc/fpmake.pp
--- Recording mergeinfo for merge of r18802 into '.':
 G   .
--- Merging r18803 into '.':
U    packages/gtk2/fpmake.pp
--- Recording mergeinfo for merge of r18803 into '.':
 G   .

git-svn-id: branches/fixes_2_6@25400 -

packages/fcl-base/fpmake.pp

@@ -32,7 +32,7 @@ begin
     P.IncludePath.Add('src');
     P.IncludePath.Add('src/$(OS)');
     P.IncludePath.Add('src/unix',AllUnixOSes);
-    P.IncludePath.Add('src/win',AllWindowsOSes);
+    P.IncludePath.Add('src/win',AllWindowsOSes-[WinCE]);
     P.IncludePath.Add('src/dummy',AllOSes);
 
     T:=P.Targets.AddUnit('ascii85.pp');

packages/fcl-image/fpmake.pp

@@ -221,14 +221,14 @@ begin
         begin
           AddUnit('fpimage');
         end;
-    T:=P.Targets.AddUnit('freetypeh.pp');
-    T:=P.Targets.AddUnit('freetype.pp');
+    T:=P.Targets.AddUnit('freetypeh.pp',[solaris,iphonesim,darwin,freebsd,linux,haiku,beos,win32,win64]);
+    T:=P.Targets.AddUnit('freetype.pp',[solaris,iphonesim,darwin,freebsd,linux,haiku,beos,win32,win64]);
       with T.Dependencies do
         begin
           AddUnit('freetypeh');
           AddUnit('fpimgcmn');
         end;
-    T:=P.Targets.AddUnit('ftfont.pp');
+    T:=P.Targets.AddUnit('ftfont.pp',[solaris,iphonesim,darwin,freebsd,linux,haiku,beos,win32,win64]);
       with T.Dependencies do
         begin
           AddUnit('fpcanvas');

packages/graph/fpmake.pp

@@ -83,9 +83,6 @@ begin
           AddInclude('modes.inc');
           AddInclude('fills.inc');
           AddInclude('gtext.inc');
-          AddUnit('sdl');
-          AddUnit('sdlutils');
-          AddUnit('logger');
         end;
     T:=P.Targets.AddUnit('wincrt.pp',[win32]);
       with T.Dependencies do

packages/gtk2/fpmake.pp

@@ -17,6 +17,7 @@ begin
     P.Directory:='gtk2';
 {$endif ALLPACKAGES}
     P.Version:='2.6.3';
+    P.SupportBuildModes := [bmOneByOne];
     P.OSes:=AllUnixOSes+[Win32,Win64];
     P.Author := 'Library: Peter Mattis, Spencer Kimball and Josh MacDonald, header: Mattias Gaertner, Olaf Leidinger';
     P.License := 'Library: LGPL2.1, header: LGPL with modification, ';

packages/libgbafpc/fpmake.pp

@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libgbafpc');
+    P.OSes:=[gba];
 {$ifdef ALLPACKAGES}
     P.Directory:='libgbafpc';
 {$endif ALLPACKAGES}

packages/libndsfpc/fpmake.pp

@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libndsfpc');
+    P.OSes:=[nds];
 {$ifdef ALLPACKAGES}
     P.Directory:='libndsfpc';
 {$endif ALLPACKAGES}