Pārlūkot izejas kodu

* made dblib/fpmake.pp to use the same structure as other fpmake files => avoids hint on unused variable during make all

florian 10 mēneši atpakaļ
vecāks
revīzija
12f0ccbb01
2 mainītis faili ar 10 papildinājumiem un 17 dzēšanām
  1. 6 17
      packages/dblib/fpmake.pp
  2. 4 0
      packages/fpmake_proc.inc

+ 6 - 17
packages/dblib/fpmake.pp

@@ -4,20 +4,13 @@ program fpmake;
 
 uses {$ifdef unix}cthreads,{$endif} fpmkunit;
 
-{$endif not ALLPACKAGES}
-
-procedure add_dblib(const ADirectory: string);
-
-Const
-  DBLibOSes         = [linux,freebsd,netbsd,openbsd,solaris,win32,win64,haiku,android,dragonfly,beos];
-
 Var
   P : TPackage;
   T : TTarget;
-  
 begin
   With Installer do
     begin
+{$endif ALLPACKAGES}
       P:=AddPackage('dblib');
       P.ShortName := 'dblb';
       P.Directory:=ADirectory;
@@ -32,20 +25,16 @@ begin
       P.SourcePath.Add('src');
       P.IncludePath.Add('src');
 
-      P.OSes := DBLibOSes;
+      P.OSes := [linux,freebsd,netbsd,openbsd,solaris,win32,win64,haiku,android,dragonfly,beos];
       if Defaults.CPU=jvm then
         P.OSes := P.OSes - [android];
 
-      T:=P.Targets.AddUnit('dblib.pp',DBLibOSes);
+      T:=P.Targets.AddUnit('dblib.pp',P.OSes);
 
-    P.NamespaceMap:='namespaces.lst';
-    
-    end;
-end;
+      P.NamespaceMap:='namespaces.lst';
 
 {$ifndef ALLPACKAGES}
-begin
-  add_dblib('');
-  Installer.Run;
+      Run;
+    end;
 end.
 {$endif ALLPACKAGES}

+ 4 - 0
packages/fpmake_proc.inc

@@ -64,7 +64,11 @@ begin
 {$include cocoaint/fpmake.pp}
 end;
 
+procedure add_dblib(const ADirectory: string);
+begin
+  with Installer do
 {$include dblib/fpmake.pp}
+end;
 
 procedure add_dbus(const ADirectory: string);
 begin