Quellcode durchsuchen

* Removed double addition of ptop
* Added fpcreslipo compilation to fpmake

git-svn-id: trunk@24483 -

joost vor 12 Jahren
Ursprung
Commit
478243254e
5 geänderte Dateien mit 55 neuen und 1 gelöschten Zeilen
  1. 1 0
      .gitattributes
  2. 51 0
      utils/fpcreslipo/fpmake.pp
  3. 0 1
      utils/fpmake.pp
  4. 1 0
      utils/fpmake_add.inc
  5. 2 0
      utils/fpmake_proc.inc

+ 1 - 0
.gitattributes

@@ -14316,6 +14316,7 @@ utils/fpcres/target.pas svneol=native#text/plain
 utils/fpcreslipo/Makefile svneol=native#text/plain
 utils/fpcreslipo/Makefile.fpc svneol=native#text/plain
 utils/fpcreslipo/fpcreslipo.pp svneol=native#text/plain
+utils/fpcreslipo/fpmake.pp svneol=native#text/plain
 utils/fpcreslipo/msghandler.pp svneol=native#text/plain
 utils/fpcreslipo/paramparser.pp svneol=native#text/plain
 utils/fpcreslipo/sourcehandler.pp svneol=native#text/plain

+ 51 - 0
utils/fpcreslipo/fpmake.pp

@@ -0,0 +1,51 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_fpcreslipo;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('fpcreslipo');
+
+    P.Author := 'Giulio Bernardi';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='fpcreslipo';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+    P.Dependencies.Add('fcl-res');
+
+    P.OSes:=[darwin, iphonesim];
+
+    P.Targets.AddImplicitUnit('msghandler.pp');
+    P.Targets.AddImplicitUnit('paramparser.pp');
+    P.Targets.AddImplicitUnit('sourcehandler.pp');
+    P.Targets.AddImplicitUnit('fpcreslipo.pp');
+
+    T:=P.Targets.AddProgram('fpcreslipo.pp');
+
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fpcreslipo;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+

+ 0 - 1
utils/fpmake.pp

@@ -34,7 +34,6 @@ begin
     T.ResourceStrings:=true;
 
     P.Targets.AddProgram('ppdep.pp');
-    P.Targets.AddProgram('ptop.pp');
     P.Targets.AddProgram('rstconv.pp').ResourceStrings:=true;
     P.Targets.AddProgram('data2inc.pp');
     P.Targets.AddProgram('delp.pp');

+ 1 - 0
utils/fpmake_add.inc

@@ -2,6 +2,7 @@
   add_fpcm;
   add_fpcmkcfg;
   add_fpcres;
+  add_fpcreslipo;
   add_fpdoc;
   add_fpmc;
   add_fppkg_util;

+ 2 - 0
utils/fpmake_proc.inc

@@ -6,6 +6,8 @@
 
 {$include fpcres/fpmake.pp}
 
+{$include fpcreslipo/fpmake.pp}
+
 {$include fpdoc/fpmake.pp}
 
 {$include fpmc/fpmake.pp}