paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-07-28 18:26:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

* avoid platform specific ifdefs in eventlog.pp and allow OS/2 implementation being used again

Browse Source 
git-svn-id: trunk@12204 -
This commit is contained in:
Tomas Hajny 2008-11-23 01:52:33 +00:00
parent 57c4392fca
commit 8de51a03cb
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1101,8 +1101,8 @@ packages/fcl-base/src/cachecls.pp svneol=native#text/plain
packages/fcl-base/src/contnrs.pp svneol=native#text/plain packages/fcl-base/src/contnrs.pp svneol=native#text/plain
packages/fcl-base/src/custapp.pp svneol=native#text/plain packages/fcl-base/src/custapp.pp svneol=native#text/plain
packages/fcl-base/src/daemonapp.pp svneol=native#text/plain packages/fcl-base/src/daemonapp.pp svneol=native#text/plain
packages/fcl-base/src/dummy/eventlog.inc svneol=native#text/plain
packages/fcl-base/src/eventlog.pp svneol=native#text/plain packages/fcl-base/src/eventlog.pp svneol=native#text/plain
packages/fcl-base/src/felog.inc svneol=native#text/plain
packages/fcl-base/src/fpexprpars.pp svneol=native#text/plain packages/fcl-base/src/fpexprpars.pp svneol=native#text/plain
packages/fcl-base/src/fptimer.pp svneol=native#text/plain packages/fcl-base/src/fptimer.pp svneol=native#text/plain
packages/fcl-base/src/gettext.pp svneol=native#text/plain packages/fcl-base/src/gettext.pp svneol=native#text/plain

1
packages/fcl-base/Makefile.fpc
View File

@ -49,6 +49,7 @@ includedir_win32=src/win
includedir_win64=src/win includedir_win64=src/win
includedir_wince=src/win includedir_wince=src/win
sourcedir=src/$(OS_TARGET) src sourcedir=src/$(OS_TARGET) src
includedir_linux=src/dummy
[prerules] [prerules]
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)

6
packages/fcl-base/fpmake.pp
View File

@ -21,7 +21,7 @@ begin
P.Author := '<various>'; P.Author := '<various>';
P.License := 'LGPL with modification, '; P.License := 'LGPL with modification, ';
P.HomepageURL := 'www.freepascal.org'; P.ExternalURL := 'www.freepascal.org';
P.Email := ''; P.Email := '';
P.Description := 'Base library of Free Component Libraries(FCL), FPC''s OOP library.'; P.Description := 'Base library of Free Component Libraries(FCL), FPC''s OOP library.';
P.NeedLibC:= false; P.NeedLibC:= false;
@ -34,6 +34,7 @@ begin
P.IncludePath.Add('src/unix',AllUnixOSes); P.IncludePath.Add('src/unix',AllUnixOSes);
P.IncludePath.Add('src/win',AllWindowsOSes); P.IncludePath.Add('src/win',AllWindowsOSes);
P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes); P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
P.IncludePath.Add('src/dummy',AllOSes);
T:=P.Targets.AddUnit('avl_tree.pp'); T:=P.Targets.AddUnit('avl_tree.pp');
T:=P.Targets.AddUnit('base64.pp'); T:=P.Targets.AddUnit('base64.pp');
@ -55,8 +56,7 @@ begin
T.ResourceStrings:=true; T.ResourceStrings:=true;
with T.Dependencies do with T.Dependencies do
begin begin
AddInclude('eventlog.inc',AllUnixOSes+[Win32,Win64]); AddInclude('eventlog.inc');
AddInclude('felog.inc',AllOSes-AllUnixOSes-[Win32,Win64]);
end; end;
T:=P.Targets.AddUnit('fptimer.pp',AllWindowsOSes+AllUnixOSes); T:=P.Targets.AddUnit('fptimer.pp',AllWindowsOSes+AllUnixOSes);
T:=P.Targets.AddUnit('gettext.pp'); T:=P.Targets.AddUnit('gettext.pp');

0
packages/fcl-base/src/felog.inc → packages/fcl-base/src/dummy/eventlog.inc
View File

6
packages/fcl-base/src/eventlog.pp
View File

@ -111,11 +111,9 @@ Resourcestring
implementation implementation
{$if defined(win32) or defined(win64) or defined(unix)}
{$i eventlog.inc} {$i eventlog.inc}
{$else} (* File based dummy implementation is used for all platforms not providing
{$i felog.inc} specific implementation of eventlog.inc for the particular platform. *)
{$endif}
{ TEventLog } { TEventLog }