From 83e3d311d7a4e75491e1a3a8a08961e8d13823a6 Mon Sep 17 00:00:00 2001 From: joost Date: Thu, 2 Feb 2012 12:01:01 +0000 Subject: [PATCH] * Fixed wince compilation (fpmake) git-svn-id: trunk@20215 - --- packages/fcl-process/fpmake.pp | 6 +++--- packages/postgres/fpmake.pp | 2 +- packages/winceunits/fpmake.pp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/fcl-process/fpmake.pp b/packages/fcl-process/fpmake.pp index 5c296412cc..5440c017a9 100644 --- a/packages/fcl-process/fpmake.pp +++ b/packages/fcl-process/fpmake.pp @@ -27,9 +27,9 @@ begin P.SourcePath.Add('src'); 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.Dependencies.AddInclude('pipes.inc'); diff --git a/packages/postgres/fpmake.pp b/packages/postgres/fpmake.pp index 2b026fa4a3..ff1d52e892 100644 --- a/packages/postgres/fpmake.pp +++ b/packages/postgres/fpmake.pp @@ -18,7 +18,7 @@ begin {$endif ALLPACKAGES} P.Version:='2.7.1'; P.SourcePath.Add('src'); - P.OSes := AllUnixOSes-[qnx]+[win32,os2,emx]; + P.OSes := AllUnixOSes-[qnx]+AllWindowsOSes + [os2,emx]; P.IncludePath.Add('src'); diff --git a/packages/winceunits/fpmake.pp b/packages/winceunits/fpmake.pp index a5dee05823..510a7f02a5 100644 --- a/packages/winceunits/fpmake.pp +++ b/packages/winceunits/fpmake.pp @@ -26,16 +26,16 @@ begin P.HomepageURL := 'www.freepascal.org'; P.SourcePath.Add('src'); + P.SupportBuildModes := [bmOneByOne]; P.Options.Add('-Ur'); // 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/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:=P.Targets.AddUnit('buildwinceunits.pp', [wince]);