Browse Source

* ptc and hermes fpmake.pp fixes

git-svn-id: trunk@18048 -
joost 14 years ago
parent
commit
429b9563d8
3 changed files with 29 additions and 1 deletions
  1. 2 0
      packages/fpmake_add.inc
  2. 12 0
      packages/fpmake_proc.inc
  3. 15 1
      packages/ptc/fpmake.pp

+ 2 - 0
packages/fpmake_add.inc

@@ -37,6 +37,7 @@
   add_gtk1;
   add_gtk1;
   add_gtk2;
   add_gtk2;
   add_hash;
   add_hash;
+  add_hermes;
   add_httpd13;
   add_httpd13;
   add_httpd20;
   add_httpd20;
   add_httpd22;
   add_httpd22;
@@ -79,6 +80,7 @@
   add_pcap;
   add_pcap;
   add_postgres;
   add_postgres;
   add_proj4;
   add_proj4;
+  add_ptc;
   add_pthreads;
   add_pthreads;
   add_pxlib;
   add_pxlib;
   add_regexpr;
   add_regexpr;

+ 12 - 0
packages/fpmake_proc.inc

@@ -232,6 +232,12 @@ begin
 {$include hash/fpmake.pp}
 {$include hash/fpmake.pp}
 end;
 end;
 
 
+procedure add_hermes;
+begin
+  with Installer do
+{$include hermes/fpmake.pp}
+end;
+
 procedure add_httpd13;
 procedure add_httpd13;
 begin
 begin
   with Installer do
   with Installer do
@@ -484,6 +490,12 @@ begin
 {$include proj4/fpmake.pp}
 {$include proj4/fpmake.pp}
 end;
 end;
 
 
+procedure add_ptc;
+begin
+  with Installer do
+{$include ptc/fpmake.pp}
+end;
+
 procedure add_pthreads;
 procedure add_pthreads;
 begin
 begin
   with Installer do
   with Installer do

+ 15 - 1
packages/ptc/fpmake.pp

@@ -19,7 +19,9 @@ begin
     P.Directory:='ptc';
     P.Directory:='ptc';
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.Version:='2.2.2-0';
+    p.OSes:=[linux,win32,win64];
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
+    P.SourcePath.Add('src/ptcwrapper');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src/dos',[go32v2]);
     P.IncludePath.Add('src/dos',[go32v2]);
     P.IncludePath.Add('src/dos/base',[go32v2]);
     P.IncludePath.Add('src/dos/base',[go32v2]);
@@ -38,7 +40,8 @@ begin
     P.IncludePath.Add('src/x11',AllUnixOSes);
     P.IncludePath.Add('src/x11',AllUnixOSes);
 
 
   P.Dependencies.Add('hermes');
   P.Dependencies.Add('hermes');
-  P.Dependencies.Add('x');
+  P.Dependencies.Add('x11');
+  P.Dependencies.Add('fcl-base');
 
 
   T:=P.Targets.AddUnit('ptc.pp');
   T:=P.Targets.AddUnit('ptc.pp');
   with T.Dependencies do
   with T.Dependencies do
@@ -106,6 +109,17 @@ begin
       AddUnit('vesa',[Go32v2]);
       AddUnit('vesa',[Go32v2]);
       AddUnit('vga',[Go32v2]);
       AddUnit('vga',[Go32v2]);
      end;
      end;
+    T:=P.Targets.AddUnit('ptceventqueue.pp');
+    with T.Dependencies do
+      begin
+        AddUnit('ptc');
+      end;
+    T:=P.Targets.AddUnit('ptcwrapper.pp');
+    with T.Dependencies do
+      begin
+        AddUnit('ptc');
+        AddUnit('ptceventqueue');
+      end;
 
 
     P.ExamplePath.Add('examples/');
     P.ExamplePath.Add('examples/');
     P.Targets.AddExampleProgram('random.pp');
     P.Targets.AddExampleProgram('random.pp');