浏览代码

* Fixed wince compilation (fpmake)

git-svn-id: trunk@20215 -
joost 13 年之前
父节点
当前提交
83e3d311d7
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 3 3
      packages/fcl-process/fpmake.pp
  2. 1 1
      packages/postgres/fpmake.pp
  3. 4 4
      packages/winceunits/fpmake.pp

+ 3 - 3
packages/fcl-process/fpmake.pp

@@ -27,9 +27,9 @@ begin
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/unix',AllUnixOSes);
-    P.IncludePath.Add('src/win',AllWindowsOSes);
-    P.IncludePath.Add('src/dummy',AllOSes-AllWindowsOSes-AllUnixOSes);
-    P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
+    P.IncludePath.Add('src/win',[win32,win64]);
+    P.IncludePath.Add('src/dummy',AllOSes-[win32,win64]-AllUnixOSes);
+    P.IncludePath.Add('src/$(OS)',AllOSes-[win32,win64]-AllUnixOSes);
 
 
     T:=P.Targets.AddUnit('pipes.pp');
     T:=P.Targets.AddUnit('pipes.pp');
       T.Dependencies.AddInclude('pipes.inc');
       T.Dependencies.AddInclude('pipes.inc');

+ 1 - 1
packages/postgres/fpmake.pp

@@ -18,7 +18,7 @@ begin
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Version:='2.7.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
-    P.OSes := AllUnixOSes-[qnx]+[win32,os2,emx];
+    P.OSes := AllUnixOSes-[qnx]+AllWindowsOSes + [os2,emx];
 
 
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
 
 

+ 4 - 4
packages/winceunits/fpmake.pp

@@ -26,16 +26,16 @@ begin
     P.HomepageURL := 'www.freepascal.org';
     P.HomepageURL := 'www.freepascal.org';
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
+    P.SupportBuildModes := [bmOneByOne];
 
 
     P.Options.Add('-Ur');
     P.Options.Add('-Ur');
 
 
     // These units are from the winunits-base package.
     // These units are from the winunits-base package.
-    //P.SourcePath := '../winunits-base/src';
     T:=P.Targets.AddUnit('../winunits-base/src/comobj.pp', [wince]);
     T:=P.Targets.AddUnit('../winunits-base/src/comobj.pp', [wince]);
     T:=P.Targets.AddUnit('../winunits-base/src/activex.pp', [wince]);
     T:=P.Targets.AddUnit('../winunits-base/src/activex.pp', [wince]);
-    T:=P.Targets.AddUnit('../wininits-base/ole2.pp', [wince]);
-    T:=P.Targets.AddUnit('../wininits-base/tlhelp32.pp', [wince]);
-    T:=P.Targets.AddUnit('../wininits-base/comconst.pp', [wince]);
+    T:=P.Targets.AddUnit('../winunits-base/src/ole2.pp', [wince]);
+    T:=P.Targets.AddUnit('tlhelp32.pas', [wince]);
+    T:=P.Targets.AddUnit('../winunits-base/src/comconst.pp', [wince]);
     T.ResourceStrings:=True;
     T.ResourceStrings:=True;
 
 
     T:=P.Targets.AddUnit('buildwinceunits.pp', [wince]);
     T:=P.Targets.AddUnit('buildwinceunits.pp', [wince]);