* Several fpmake-file updates

git-svn-id: trunk@17976 -

packages/bzip2/fpmake.pp

@@ -30,11 +30,20 @@ begin
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 
+    T:=P.Targets.AddUnit('bzip2comn.pas');
     T:=P.Targets.AddUnit('bzip2.pas');
       with T.Dependencies do
         begin
           AddInclude('bzip2i386.inc',[i386],AllOSes);
+          AddUnit('bzip2comn');
         end;
+    T:=P.Targets.AddUnit('bzip2stream.pas');
+      with T.Dependencies do
+        begin
+          AddInclude('bzip2sii386.inc',[i386],AllOSes);
+          AddUnit('bzip2comn');
+        end;
+    T.ResourceStrings := true;
 
     P.ExamplePath.Add('examples');
     T:=P.Targets.AddExampleProgram('pasbzip.pas');

packages/cdrom/fpmake.pp

@@ -42,6 +42,8 @@ begin
         begin
           AddUnit('cdrom');
         end;
+    T:=P.Targets.AddUnit('fpcddb.pp');
+    T.ResourceStrings := True;
 
     // Linux
     T:=P.Targets.AddUnit('lincd.pp',[Linux]);

packages/chm/fpmake.pp

@@ -27,6 +27,7 @@ begin
     P.NeedLibC:= false;
 
     D:=P.Dependencies.Add('fcl-xml');
+    D:=P.Dependencies.Add('fcl-base');
     D.Version:='2.2.2-0';
     
     P.SourcePath.Add('src');

packages/fcl-extra/fpmake.pp

@@ -18,9 +18,10 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.Dependencies.Add('fcl-base');
+    P.OSes:=AllWindowsOSes+AllUnixOSes;
     P.Dependencies.Add('winunits-jedi',[Win32,Win64]);
     P.Dependencies.Add('winunits-base',[Win32,Win64]);
-    P.Dependencies.Add('univint',[darwin]);
+    P.Dependencies.Add('univint',[darwin,iPhoneSim]);
 
     P.Author := '<various>';
     P.License := 'LGPL with modification, ';

packages/fcl-json/fpmake.pp

@@ -45,6 +45,14 @@ begin
         end;
     T:=P.Targets.AddUnit('jsonscanner.pp');
       T.ResourceStrings:=true;
+    T:=P.Targets.AddUnit('fpjsonrtti.pp');
+      T.ResourceStrings:=true;
+      with T.Dependencies do
+        begin
+          AddUnit('fpjson');
+          AddUnit('jsonparser');
+        end;
+      T.ResourceStrings:=true;
 
     P.ExamplePath.Add('examples');
     T:=P.Targets.AddExampleProgram('confdemo.pp');

packages/fcl-net/fpmake.pp

@@ -42,11 +42,13 @@ begin
           AddInclude('resolve.inc');
           AddUnit('netdb');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('ssockets.pp',AllUnixOSes+AllWindowsOSes+[OS2,EMX]);
       with T.Dependencies do
         begin
           AddUnit('resolve');
         end;
+    T.ResourceStrings := True;
 
     // HTTP Client
     T:=P.Targets.AddUnit('fpsock.pp',AllUnixOSes);
@@ -54,6 +56,10 @@ begin
         begin
           AddUnit('resolve');
         end;
+    T.ResourceStrings := True;
+
+    T:=P.Targets.AddUnit('cnetdb.pp',[linux,freebsd]);
+
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('examples/ip6test.pp');
     P.Targets.AddExampleProgram('examples/svrclass.pp');

packages/fcl-passrc/fpmake.pp

@@ -28,6 +28,7 @@ begin
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('pastree.pp');
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('paswrite.pp');
       with T.Dependencies do
         begin
@@ -39,7 +40,9 @@ begin
           AddUnit('pastree');
           AddUnit('pscanner');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('pscanner.pp');
+    T.ResourceStrings := True;
 
 {$ifndef ALLPACKAGES}
     Run;

packages/fcl-registry/fpmake.pp

@@ -37,6 +37,7 @@ begin
           AddInclude('regini.inc');
           AddUnit('xmlreg');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('xmlreg.pp');
 
     P.ExamplePath.Add('examples');

packages/fcl-res/fpmake.pp

@@ -187,6 +187,7 @@ begin
         begin
           AddUnit('resource');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('resmerger.pp');
       with T.Dependencies do
         begin
@@ -202,6 +203,7 @@ begin
           AddUnit('resourcetree');
           AddUnit('resmerger');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('resourcetree.pp');
       with T.Dependencies do
         begin
@@ -226,6 +228,7 @@ begin
           AddUnit('resource');
           AddUnit('resfactory');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('strtable.pp');
       with T.Dependencies do
         begin
@@ -245,6 +248,7 @@ begin
           AddUnit('resource');
           AddUnit('versionconsts');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('winpeimagereader.pp');
       with T.Dependencies do
         begin

packages/fv/fpmake.pp

@@ -40,6 +40,7 @@ begin
           AddUnit('msgbox');
           AddUnit('fvconsts');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('asciitab.pas');
       with T.Dependencies do
         begin
@@ -97,6 +98,7 @@ begin
           AddUnit('app');
           AddUnit('histlist');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('drivers.pas');
       with T.Dependencies do
         begin
@@ -118,6 +120,7 @@ begin
           AddUnit('stddlg');
           AddUnit('msgbox');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('fvcommon.pas');
       with T.Dependencies do
         begin
@@ -173,6 +176,7 @@ begin
           AddUnit('views');
           AddUnit('app');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('outline.pas');
       with T.Dependencies do
         begin
@@ -204,6 +208,7 @@ begin
           AddUnit('histlist');
           AddUnit('msgbox');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('sysmsg.pas');
       with T.Dependencies do
         begin

packages/ibase/fpmake.pp

@@ -33,6 +33,7 @@ begin
         begin
           AddInclude('ibase60.inc');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('ibase60.pp');
       with T.Dependencies do
         begin

packages/mysql/fpmake.pp

@@ -53,6 +53,7 @@ begin
         begin
           AddInclude('mysql.inc');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('mysql40.pp');
       with T.Dependencies do
         begin
@@ -63,6 +64,7 @@ begin
         begin
           AddInclude('mysql.inc');
         end;
+    T.ResourceStrings := True;;
     T:=P.Targets.AddUnit('mysql41.pp');
       with T.Dependencies do
         begin
@@ -87,6 +89,7 @@ begin
           AddUnit('my4_sys');
           AddUnit('mysql4_comdyn');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('mysql4.pp');
       with T.Dependencies do
         begin
@@ -101,11 +104,23 @@ begin
         begin
           AddInclude('mysql.inc');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('mysql50.pp');
       with T.Dependencies do
         begin
           AddInclude('mysql.inc');
         end;
+    T:=P.Targets.AddUnit('mysql51.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('mysql.inc');
+        end;
+    T:=P.Targets.AddUnit('mysql51dyn.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('mysql.inc');
+        end;
+    T.ResourceStrings := True;
 
     P.ExamplePath.Add('tests');
     P.Targets.AddExampleProgram('testdb3.pp');

packages/ncurses/fpmake.pp

@@ -47,6 +47,11 @@ begin
         begin
           AddUnit('ncurses');
         end;
+    T:=P.Targets.AddUnit('form.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('ncurses');
+        end;
 
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('t2menu.pp');

packages/paszlib/fpmake.pp

@@ -44,6 +44,7 @@ begin
       T.Dependencies.AddUnit('ziputils');
     T:=P.Targets.AddUnit('zipper.pp');
       T.Dependencies.AddUnit('paszlib');
+    T.ResourceStrings := True;
     T:=P.Targets.AddImplicitUnit('adler.pas');
       T.Dependencies.AddInclude('zconf.inc');
     T:=P.Targets.AddImplicitUnit('gzio.pas');
@@ -54,12 +55,14 @@ begin
     T:=P.Targets.AddImplicitUnit('infutil.pas');
     T:=P.Targets.AddImplicitUnit('trees.pas');
     T:=P.Targets.AddImplicitUnit('zbase.pas');
+    T.ResourceStrings := True;
     T:=P.Targets.AddImplicitUnit('zcompres.pas');
     T:=P.Targets.AddImplicitUnit('zdeflate.pas');
     T:=P.Targets.AddImplicitUnit('zinflate.pas');
     T:=P.Targets.AddImplicitUnit('zuncompr.pas');
     T:=P.Targets.AddImplicitUnit('ziputils.pas');
     T:=P.Targets.AddImplicitUnit('zstream.pp');
+    T.ResourceStrings := True;
     T:=P.Targets.AddExampleProgram('examples/example.pas');
     T:=P.Targets.AddExampleProgram('examples/minigzip.pas');
     T:=P.Targets.AddExampleProgram('examples/miniunz.pas');

packages/postgres/fpmake.pp

@@ -36,6 +36,7 @@ begin
           AddInclude('postgres3types.inc');
           AddUnit('dllistdyn');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('postgres3.pp');
       with T.Dependencies do
         begin

packages/regexpr/fpmake.pp

@@ -21,6 +21,7 @@ begin
 
     T:=P.Targets.AddUnit('regexpr.pp');
     T:=P.Targets.AddUnit('regex.pp');
+    T.ResourceStrings := True;
 
     P.ExamplePath.Add('tests');
     P.Targets.AddExampleProgram('testreg1.pp');

packages/sqlite/fpmake.pp

@@ -30,6 +30,7 @@ begin
         begin
           AddInclude('sqlite3.inc');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('sqlite3.pp');
       with T.Dependencies do
         begin

packages/symbolic/fpmake.pp

@@ -35,6 +35,7 @@ begin
           AddInclude('teval.inc');
           AddInclude('rearrang.inc');
         end;
+    T.ResourceStrings := True;
 
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('evaltest.pas');

packages/users/fpmake.pp

@@ -37,6 +37,7 @@ begin
           AddUnit('shadow',[linux]);
           AddUnit('grp');
         end;
+    T.ResourceStrings := true;
 
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testpass.pp');

packages/xforms/fpmake.pp

@@ -26,7 +26,7 @@ begin
         begin
           AddInclude('cursorfont.inc');
         end;
-
+    T:=P.Targets.AddProgram('fd2pascal.pp');
 
     P.Sources.AddSrc('README.txt');
 

packages/zorba/fpmake.pp

@@ -33,6 +33,7 @@ begin
           AddInclude('zorba.inc');
           AddInclude('zorba_options.inc');
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('zorba.pas');
       with T.Dependencies do
         begin