* Fixes for fpmake files

git-svn-id: trunk@15261 -

packages/fcl-async/fpmake.pp

@@ -24,6 +24,7 @@ begin
     P.Email := '';
     P.Description := 'Asynchonous event management of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
+    P.OSes:=AllUnixOses;
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src/unix',AllUnixOSes);

packages/fcl-base/fpmake.pp

@@ -26,23 +26,26 @@ begin
     P.NeedLibC:= false;
 
     P.SourcePath.Add('src');
+    P.SourcePath.Add('src/$(OS)');
     P.SourcePath.Add('src/unix',AllUnixOSes);
     P.SourcePath.Add('src/win',AllWindowsOSes);
-    P.SourcePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
     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/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
     P.IncludePath.Add('src/dummy',AllOSes);
 
     T:=P.Targets.AddUnit('ascii85.pp');
     T:=P.Targets.AddUnit('avl_tree.pp');
     T:=P.Targets.AddUnit('base64.pp');
     T:=P.Targets.AddUnit('blowfish.pp');
+      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('bufstream.pp');
+      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('cachecls.pp');
       T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('contnrs.pp');
+      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('custapp.pp');
       T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('eventlog.pp');
@@ -68,6 +71,7 @@ begin
     T:=P.Targets.AddUnit('iostream.pp');
     T:=P.Targets.AddUnit('libtar.pp');
     T:=P.Targets.AddUnit('maskutils.pp');
+      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('pooledmm.pp');
     T:=P.Targets.AddUnit('rtfpars.pp');
       with T.Dependencies do
@@ -79,6 +83,9 @@ begin
       T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('streamex.pp');
     T:=P.Targets.AddUnit('streamio.pp');
+      T.ResourceStrings:=true;
+    T:=P.Targets.AddUnit('fptemplate.pp');
+      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('syncobjs.pp',AllOSes-[GO32v2,OS2,EMX]);
     T:=P.Targets.AddUnit('uriparser.pp');
     T:=P.Targets.AddUnit('wformat.pp');
@@ -93,9 +100,9 @@ begin
           AddUnit('wformat');
         end;
     T:=P.Targets.AddUnit('fpexprpars.pp');
+      T.ResourceStrings:=true;
 
     // Windows units
-    T:=P.Targets.AddUnit('ServiceManager.pas',[Win32,Win64]);
     T:=P.Targets.AddUnit('fileinfo.pp',AllWindowsOSes);
 
     // Additional sources

packages/fcl-extra/fpmake.pp

@@ -29,9 +29,9 @@ begin
     P.NeedLibC:= false;
 
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/win',AllWindowsOSes);
-    P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
     P.IncludePath.Add('src/dummy',AllOSes);
 
     T:=P.Targets.AddUnit('daemonapp.pp',AllWindowsOSes+AllUnixOSes);

packages/fcl-fpcunit/fpmake.pp

@@ -39,6 +39,7 @@ begin
           AddUnit('testutils');
         end;
     T:=P.Targets.AddUnit('fpcunit.pp');
+      T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddInclude('DUnitCompatibleInterface.inc');

packages/fcl-image/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.Dependencies.Add('pasjpeg');
+    P.Dependencies.Add('hash');
     P.Dependencies.Add('paszlib');
     P.Dependencies.Add('fcl-base');
 
@@ -156,6 +157,23 @@ begin
         begin
           AddUnit('fpimage');
         end;
+    T:=P.Targets.AddUnit('fpreadgif.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('fpreadpsd.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('xwdfile.pp');
+    T:=P.Targets.AddUnit('fpreadxwd.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('xwdfile');
+        end;
     T:=P.Targets.AddUnit('fpwritebmp.pp');
       with T.Dependencies do
         begin
@@ -235,6 +253,7 @@ begin
           AddUnit('fpimgcmn');
         end;
     T:=P.Targets.AddUnit('pscanvas.pp');
+      T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('fpimage');

packages/fcl-js/fpmake.pp

@@ -29,7 +29,9 @@ begin
     T:=P.Targets.AddUnit('jsbase.pp');
     T:=P.Targets.AddUnit('jstree.pp');
     T:=P.Targets.AddUnit('jsscanner.pp');
+      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('jsparser.pp');
+      T.ResourceStrings:=true;
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/fcl-json/fpmake.pp

@@ -28,19 +28,23 @@ begin
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('fpjson.pp');
+      T.ResourceStrings:=true;
     T:=P.Targets.AddUnit('jsonconf.pp');
+      T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('fpjson');
           AddUnit('jsonparser');
         end;
     T:=P.Targets.AddUnit('jsonparser.pp');
+      T.ResourceStrings:=true;
       with T.Dependencies do
         begin
           AddUnit('fpjson');
           AddUnit('jsonscanner');
         end;
     T:=P.Targets.AddUnit('jsonscanner.pp');
+      T.ResourceStrings:=true;
 
     P.ExamplePath.Add('examples');
     T:=P.Targets.AddExampleProgram('confdemo.pp');

packages/fpmkunit/fpmake.pp

@@ -35,7 +35,8 @@ begin
     D:=P.Dependencies.Add('fcl-process');
       D.Version:='2.2.2-0';
 
-    P.Targets.AddUnit('src/fpmkunit.pp');
+    with P.Targets.AddUnit('src/fpmkunit.pp') do
+      ResourceStrings:=true;
 
 {$ifndef ALLPACKAGES}
     Run;