Browse Source

* fpmake.pp fixes

git-svn-id: trunk@15183 -
joost 15 years ago
parent
commit
395f1bccb7
4 changed files with 39 additions and 22 deletions
  1. 1 1
      packages/chm/fpmake.pp
  2. 34 12
      packages/fcl-db/fpmake.pp
  3. 1 8
      packages/librsvg/fpmake.pp
  4. 3 1
      packages/libxml/fpmake.pp

+ 1 - 1
packages/chm/fpmake.pp

@@ -74,7 +74,7 @@ begin
           AddUnit('paslzxcomp');
           AddUnit('chmfiftimain');
         end;
-    T:=P.Targets.AddUnit('lzxcompressthread');
+    T:=P.Targets.AddUnit('lzxcompressthread.pas');
       with T.Dependencies do
         begin
           AddUnit('paslzxcomp');

+ 34 - 12
packages/fcl-db/fpmake.pp

@@ -53,6 +53,7 @@ begin
     P.IncludePath.Add('src/dbase');
 
     P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fcl-xml');
     P.Dependencies.Add('ibase');
     P.Dependencies.Add('mysql');
     P.Dependencies.Add('odbc');
@@ -61,7 +62,9 @@ begin
     P.Dependencies.Add('sqlite');
     P.Dependencies.Add('pxlib');
 
+    P.Options.Add('-S2h');
 
+    // base
     T:=P.Targets.AddUnit('bufdataset.pas');
       with T.Dependencies do
         begin
@@ -69,6 +72,7 @@ begin
           AddUnit('bufdataset_parser');
           AddUnit('dbconst');
         end;
+
     T:=P.Targets.AddUnit('bufdataset_parser.pp');
       with T.Dependencies do
         begin
@@ -77,12 +81,7 @@ begin
           AddUnit('dbf_prsdef');
           AddUnit('dbconst');
         end;
-    T:=P.Targets.AddUnit('customsqliteds.pas');
-      with T.Dependencies do
-        begin
-          AddUnit('db');
-          AddUnit('dbconst');
-        end;
+
     T:=P.Targets.AddUnit('db.pas');
       with T.Dependencies do
         begin
@@ -93,12 +92,35 @@ begin
           AddInclude('dsparams.inc');
           AddUnit('dbconst');
         end;
+
     T:=P.Targets.AddUnit('dbcoll.pp');
       with T.Dependencies do
         begin
           AddUnit('db');
         end;
+
     T:=P.Targets.AddUnit('dbconst.pas');
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('sqlscript.pp');
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('dbwhtml.pp');
+    with T.Dependencies do
+      begin
+        AddUnit('db');
+        AddUnit('dbconst');
+      end;
+
+    T:=P.Targets.AddUnit('xmldatapacketreader.pp');
+    T.ResourceStrings:=true;
+    with T.Dependencies do
+      begin
+        AddUnit('bufdataset');
+        AddUnit('db');
+      end;
+
+    // dbase
     T:=P.Targets.AddUnit('dbf.pas');
       with T.Dependencies do
         begin
@@ -264,12 +286,6 @@ begin
         begin
           AddInclude('dbf_common.inc');
         end;
-    T:=P.Targets.AddUnit('dbwhtml.pp');
-      with T.Dependencies do
-        begin
-          AddUnit('db');
-          AddUnit('dbconst');
-        end;
     T:=P.Targets.AddUnit('fpcgcreatedbf.pp');
       with T.Dependencies do
         begin
@@ -400,6 +416,12 @@ begin
           AddUnit('fpddmysql50');
           AddUnit('fpddodbc');
         end;
+    T:=P.Targets.AddUnit('customsqliteds.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('db');
+          AddUnit('dbconst');
+        end;
     T:=P.Targets.AddUnit('fpddsqldb.pp');
       with T.Dependencies do
         begin

+ 1 - 8
packages/librsvg/fpmake.pp

@@ -19,16 +19,9 @@ begin
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
+    P.Dependencies.Add('gtk2');
 
   T:=P.Targets.AddUnit('rsvg.pas');
-  with T.Dependencies do
-    begin
-    end;
-
-    // 'Makefile
-    // 'Makefile.fpc
-    // 'test1.xml
-    // 'test2.xml
 
 {$ifndef ALLPACKAGES}
     Run;

+ 3 - 1
packages/libxml/fpmake.pp

@@ -30,7 +30,6 @@ begin
       AddInclude('SAX2.inc');
       AddInclude('xmlversion.inc');
       AddInclude('globals.inc');
-      AddInclude('xmlexports.inc');
       AddInclude('nanoftp.inc');
       AddInclude('SAX.inc');
       AddInclude('uri.inc');
@@ -72,6 +71,9 @@ begin
       AddInclude('schematron.inc');
     end;
 
+  T:=P.Targets.AddUnit('xmlxsd.pas');
+  T.ResourceStrings := True;
+
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('reader1.pas');
     P.Targets.AddExampleProgram('io2.pas');