Browse Source

* Specify dependency on libmicrohttpd

git-svn-id: trunk@43096 -
michael 5 years ago
parent
commit
5d753d6663
1 changed files with 27 additions and 1 deletions
  1. 27 1
      packages/fcl-web/fpmake.pp

+ 27 - 1
packages/fcl-web/fpmake.pp

@@ -21,6 +21,10 @@ begin
     P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,win32,win64,wince,aix,amiga,aros,morphos,dragonfly,android];
     P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,win32,win64,wince,aix,amiga,aros,morphos,dragonfly,android];
     if Defaults.CPU=jvm then
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
       P.OSes := P.OSes - [java,android];
+    P.OSes := [android,freebsd,linux,netbsd,openbsd,win32,win64];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
 
 
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-db');
     P.Dependencies.Add('fcl-db');
@@ -37,7 +41,7 @@ begin
     P.Dependencies.Add('winunits-base', [Win32,Win64]);
     P.Dependencies.Add('winunits-base', [Win32,Win64]);
     // (Temporary) indirect dependencies, not detected by fpcmake:
     // (Temporary) indirect dependencies, not detected by fpcmake:
     P.Dependencies.Add('univint',[MacOSX,iphonesim]);
     P.Dependencies.Add('univint',[MacOSX,iphonesim]);
-
+    P.Dependencies.Add('libmicrohttpd',AllUnixOSes+AllWindowsOSes);
     P.Author := 'FreePascal development team';
     P.Author := 'FreePascal development team';
     P.License := 'LGPL with modification, ';
     P.License := 'LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
     P.HomepageURL := 'www.freepascal.org';
@@ -190,6 +194,28 @@ begin
         OSes:=[Win32,Win64];
         OSes:=[Win32,Win64];
         Dependencies.AddUnit('custhttpsys');
         Dependencies.AddUnit('custhttpsys');
       end;
       end;
+    with P.Targets.AddUnit('custmicrohttpapp.pp') do
+      begin
+        Dependencies.AddUnit('custweb');
+        Dependencies.AddUnit('httpdefs');
+        Dependencies.AddUnit('httpprotocol');
+        ResourceStrings:=true;
+        OSes := [android,freebsd,linux,netbsd,openbsd,win32,win64];
+        if Defaults.CPU=jvm then
+          OSes := OSes - [java,android];
+      end;  
+    with P.Targets.AddUnit('microhttpapp.pp') do
+      begin
+        Dependencies.AddUnit('custweb');
+        Dependencies.AddUnit('httpdefs');
+        Dependencies.AddUnit('httpprotocol');
+        Dependencies.AddUnit('custmicrohttpapp');
+        OSes := [android,freebsd,linux,netbsd,openbsd,win32,win64];
+        if Defaults.CPU=jvm then
+          OSes := OSes - [java,android];
+      end;  
+
+      
     with P.Targets.AddUnit('fphttpstatus.pas') do
     with P.Targets.AddUnit('fphttpstatus.pas') do
       begin
       begin
         Dependencies.AddUnit('fphttpserver');
         Dependencies.AddUnit('fphttpserver');