paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-20 11:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

replaced some mosuedown with selectionchanged events from Vincent

Browse Source 
git-svn-id: trunk@6300 -
This commit is contained in:
mattias 2004-11-26 16:57:22 +00:00
parent 4985469320
commit 51caf89088
6 changed files with 233 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/codetools/memcheck.pas
View File

@ -128,7 +128,7 @@ type
must be a multiple of 8 must be a multiple of 8
because otherwise you will get because otherwise you will get
problems when releasing the usual memory part !! problems when releasing the usual memory part !!
sizeof(theap_mem_info = 16+tracesize*4 so sizeof(theap_mem_info = 16+tracesize*sizeof(pointer) so
tracesize must be even !! PM } tracesize must be even !! PM }
pheap_mem_info = ^theap_mem_info; pheap_mem_info = ^theap_mem_info;
theap_mem_info = record theap_mem_info = record
@ -1301,7 +1301,7 @@ type
must be a multiple of 8 must be a multiple of 8
because otherwise you will get because otherwise you will get
problems when releasing the usual memory part !! problems when releasing the usual memory part !!
sizeof(theap_mem_info = 16+tracesize*4 so sizeof(theap_mem_info = 16+tracesize*sizeof(pointer) so
tracesize must be even !! PM } tracesize must be even !! PM }
theap_mem_info = record theap_mem_info = record
previous, previous,
@ -2359,6 +2359,9 @@ end.
{ {
$Log$ $Log$
Revision 1.38 2004/11/26 16:57:22 mattias
replaced some mosuedown with selectionchanged events from Vincent
Revision 1.37 2004/11/22 23:24:24 mattias Revision 1.37 2004/11/22 23:24:24 mattias
fixed 1.0.10 compilation from Vincent fixed 1.0.10 compilation from Vincent

3
components/htmllite/litedith.pas
View File

@ -642,6 +642,9 @@ var
// From Delphi 3.02 graphics.pas // From Delphi 3.02 graphics.pas
// There is a bug in the ByteSwapColors from Delphi 3.0 // There is a bug in the ByteSwapColors from Delphi 3.0
procedure ByteSwapColors(var Colors; Count: Integer); procedure ByteSwapColors(var Colors; Count: Integer);
{$IFDEF SYN_LAZARUS}
{$ERROR use of assembler is not platform independency}
{$ENDIF}
var // convert RGB to BGR and vice-versa. TRGBQuad <-> TPaletteEntry var // convert RGB to BGR and vice-versa. TRGBQuad <-> TPaletteEntry
SysInfo: TSystemInfo; SysInfo: TSystemInfo;
begin begin

34
ide/editoroptions.pp
View File

@ -422,8 +422,8 @@ type
procedure KeyMappingConsistencyCheckButtonClick(Sender: TObject); procedure KeyMappingConsistencyCheckButtonClick(Sender: TObject);
// color // color
procedure ColorElementListBoxMouseUp(Sender:TObject; procedure ColorElementListBoxSelectionChange(Sender: TObject;
Button:TMouseButton; Shift:TShiftState; X,Y:integer); User: boolean);
procedure ColorPreviewMouseUp(Sender:TObject; procedure ColorPreviewMouseUp(Sender:TObject;
Button:TMouseButton; Shift:TShiftState; X,Y:integer); Button:TMouseButton; Shift:TShiftState; X,Y:integer);
procedure OnSpecialLineColors(Sender: TObject; Line: integer; procedure OnSpecialLineColors(Sender: TObject; Line: integer;
@ -2753,29 +2753,11 @@ var a, i:integer;
begin begin
Old:=CurHighlightElement; Old:=CurHighlightElement;
CurHighlightElement:=nil; CurHighlightElement:=nil;
a:=0; a:=ColorElementListBox.ItemIndex;
while a<ColorElementListBox.Items.Count do begin if (a>=0) then begin
if ColorElementListBox.Selected[a] then begin
i:=PreviewSyn.AttrCount-1;
while (i>=0) do begin
if ColorElementListBox.Items[a]=PreviewSyn.Attribute[i].Name then
break;
dec(i);
end;
if i>=0 then begin
CurHighlightElement:=PreviewSyn.Attribute[i];
break;
end;
end;
inc(a);
end;
if (CurHighlightElement=nil) and (ColorElementListBox.Items.Count>0) then
begin
// none selected -> select one
ColorElementListBox.Selected[0]:=true;
i:=PreviewSyn.AttrCount-1; i:=PreviewSyn.AttrCount-1;
while (i>=0) do begin while (i>=0) do begin
if ColorElementListBox.Items[0]=PreviewSyn.Attribute[i].Name then begin if ColorElementListBox.Items[a]=PreviewSyn.Attribute[i].Name then begin
CurHighlightElement:=PreviewSyn.Attribute[i]; CurHighlightElement:=PreviewSyn.Attribute[i];
break; break;
end; end;
@ -2925,8 +2907,8 @@ begin
end; end;
end; end;
procedure TEditorOptionsForm.ColorElementListBoxMouseUp(Sender:TObject; procedure TEditorOptionsForm.ColorElementListBoxSelectionChange(Sender: TObject;
Button:TMouseButton; Shift:TShiftState; X,Y:integer); User: boolean);
begin begin
FindCurHighlightElement; FindCurHighlightElement;
end; end;
@ -4588,7 +4570,7 @@ begin
Width:=ColorElementLabel.Width; Width:=ColorElementLabel.Width;
Height:=170; Height:=170;
MultiSelect:=false; MultiSelect:=false;
OnMouseUp:=@ColorElementListBoxMouseUp; OnSelectionChange := @ColorElementListBoxSelectionChange;
end; end;
SetAttributeToDefaultButton:=TButton.Create(Self); SetAttributeToDefaultButton:=TButton.Create(Self);

321
ideintf/Makefile
View File

@ -1,10 +1,11 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/08] # Don't edit, this file is generated by FPCMake Version 1.1 [2004/11/25]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) sunos qnx UNIXs = linux $(BSDs) sunos qnx
LIMIT83fs = go32v2 os2
FORCE: FORCE:
.PHONY: FORCE .PHONY: FORCE
override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@ -144,8 +145,13 @@ endif
ifndef OS_TARGET ifndef OS_TARGET
OS_TARGET:=$(word 5,$(FPC_COMPILERINFO)) OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
endif endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
FULL_TARGET=$(OS_TARGET)
FULL_SOURCE=$(OS_SOURCE)
else
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
endif
ifneq ($(FULL_TARGET),$(FULL_SOURCE)) ifneq ($(FULL_TARGET),$(FULL_SOURCE))
CROSSCOMPILE=1 CROSSCOMPILE=1
endif endif
@ -197,18 +203,18 @@ endif
endif endif
endif endif
endif endif
ifndef CROSSDIR ifndef CROSSBINDIR
CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(FULL_TARGET))
endif
ifndef CROSSTARGETDIR
CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
endif endif
ifndef BINUTILSPREFIX
ifndef CROSSBINDIR
ifdef CROSSCOMPILE ifdef CROSSCOMPILE
UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
ifeq ($(UNITSDIR),)
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif endif
else endif
endif
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(FULL_TARGET))
ifeq ($(UNITSDIR),)
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
@ -259,6 +265,16 @@ ifndef DIST_DESTDIR
DIST_DESTDIR:=$(BASEDIR) DIST_DESTDIR:=$(BASEDIR)
endif endif
export DIST_DESTDIR export DIST_DESTDIR
ifndef COMPILER_UNITTARGETDIR
ifdef PACKAGEDIR_MAIN
COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(FULL_TARGET)
else
COMPILER_UNITTARGETDIR=units/$(FULL_TARGET)
endif
endif
ifndef COMPILER_TARGETDIR
COMPILER_TARGETDIR=.
endif
ifndef INSTALL_BASEDIR ifndef INSTALL_BASEDIR
ifdef UNIXHier ifdef UNIXHier
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
@ -272,28 +288,16 @@ endif
endif endif
ifndef INSTALL_BINDIR ifndef INSTALL_BINDIR
ifdef UNIXHier ifdef UNIXHier
ifdef CROSSCOMPILE
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
else
INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
endif
else
ifdef CROSSCOMPILE
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
else else
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET) INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(FULL_SOURCE)
endif endif
endif endif
endif endif
ifndef INSTALL_UNITDIR ifndef INSTALL_UNITDIR
ifdef CROSSCOMPILE INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(FULL_TARGET)
INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/units
else
INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
ifdef PACKAGE_NAME ifdef PACKAGE_NAME
INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME) INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
@ -413,14 +417,14 @@ ifeq ($(CPU_TARGET),i386)
ifneq ($(findstring x86_64,$(shell uname -a)),) ifneq ($(findstring x86_64,$(shell uname -a)),)
ifeq ($(BINUTILSPREFIX),) ifeq ($(BINUTILSPREFIX),)
GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
else
GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`)
endif endif
else
GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`)
endif endif
else endif
GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) endif
ifndef GCCLIBDIR
CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
ifneq ($(CROSSGCC),)
GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
endif endif
endif endif
ifndef OTHERLIBDIR ifndef OTHERLIBDIR
@ -445,21 +449,20 @@ STATICLIBEXT=.a
SHAREDLIBEXT=.so SHAREDLIBEXT=.so
STATICLIBPREFIX=libp STATICLIBPREFIX=libp
RSTEXT=.rst RSTEXT=.rst
FPCMADE=fpcmade
ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
STATICLIBPREFIX= STATICLIBPREFIX=
FPCMADE=fpcmade.v1 FPCMADEEXT=v1
PACKAGESUFFIX=v1 PACKAGESUFFIX=v1
endif endif
ifeq ($(OS_TARGET),go32v2) ifeq ($(OS_TARGET),go32v2)
STATICLIBPREFIX= STATICLIBPREFIX=
FPCMADE=fpcmade.dos FPCMADEEXT=dos
ZIPSUFFIX=go32 ZIPSUFFIX=go32
endif endif
ifeq ($(OS_TARGET),watcom) ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX= STATICLIBPREFIX=
FPCMADE=fpcmade.wat FPCMADEEXT=wat
ZIPSUFFIX=watc ZIPSUFFIX=watc
OEXT=.obj OEXT=.obj
ASMEXT=.asm ASMEXT=.asm
@ -469,33 +472,33 @@ ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.lnx FPCMADEEXT=lnx
ZIPSUFFIX=linux ZIPSUFFIX=linux
endif endif
ifeq ($(OS_TARGET),freebsd) ifeq ($(OS_TARGET),freebsd)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.freebsd FPCMADEEXT=fbs
ZIPSUFFIX=freebsd ZIPSUFFIX=freebsd
endif endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.netbsd FPCMADEEXT=nbs
ZIPSUFFIX=netbsd ZIPSUFFIX=netbsd
endif endif
ifeq ($(OS_TARGET),openbsd) ifeq ($(OS_TARGET),openbsd)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.openbsd FPCMADEEXT=obs
ZIPSUFFIX=openbsd ZIPSUFFIX=openbsd
endif endif
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
FPCMADE=fpcmade.w32 FPCMADEEXT=w32
ZIPSUFFIX=w32 ZIPSUFFIX=w32
endif endif
ifeq ($(OS_TARGET),os2) ifeq ($(OS_TARGET),os2)
@ -503,7 +506,7 @@ BATCHEXT=.cmd
AOUTEXT=.out AOUTEXT=.out
STATICLIBPREFIX= STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
FPCMADE=fpcmade.os2 FPCMADEEXT=os2
ZIPSUFFIX=os2 ZIPSUFFIX=os2
ECHO=echo ECHO=echo
endif endif
@ -512,62 +515,73 @@ BATCHEXT=.cmd
AOUTEXT=.out AOUTEXT=.out
STATICLIBPREFIX= STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
FPCMADE=fpcmade.emx FPCMADEEXT=emx
ZIPSUFFIX=emx ZIPSUFFIX=emx
ECHO=echo ECHO=echo
endif endif
ifeq ($(OS_TARGET),amiga) ifeq ($(OS_TARGET),amiga)
EXEEXT= EXEEXT=
SHAREDLIBEXT=.library SHAREDLIBEXT=.library
FPCMADE=fpcmade.amg FPCMADEEXT=amg
endif endif
ifeq ($(OS_TARGET),morphos) ifeq ($(OS_TARGET),morphos)
EXEEXT= EXEEXT=
SHAREDLIBEXT=.library SHAREDLIBEXT=.library
FPCMADE=fpcmade.mos FPCMADEEXT=mos
endif endif
ifeq ($(OS_TARGET),atari) ifeq ($(OS_TARGET),atari)
EXEEXT=.ttp EXEEXT=.ttp
FPCMADE=fpcmade.ata FPCMADEEXT=ata
endif endif
ifeq ($(OS_TARGET),beos) ifeq ($(OS_TARGET),beos)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.be FPCMADEEXT=be
ZIPSUFFIX=be ZIPSUFFIX=be
endif endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.sun FPCMADEEXT=sun
ZIPSUFFIX=sun ZIPSUFFIX=sun
endif endif
ifeq ($(OS_TARGET),qnx) ifeq ($(OS_TARGET),qnx)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.qnx FPCMADEEXT=qnx
ZIPSUFFIX=qnx ZIPSUFFIX=qnx
endif endif
ifeq ($(OS_TARGET),netware) ifeq ($(OS_TARGET),netware)
EXEEXT=.nlm EXEEXT=.nlm
STATICLIBPREFIX= STATICLIBPREFIX=
FPCMADE=fpcmade.nw FPCMADEEXT=nw
ZIPSUFFIX=nw ZIPSUFFIX=nw
endif endif
ifeq ($(OS_TARGET),netwlibc)
EXEEXT=.nlm
STATICLIBPREFIX=
FPCMADEEXT=nwl
ZIPSUFFIX=nwl
endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT= BATCHEXT=
EXEEXT= EXEEXT=
FPCMADE=fpcmade.macos FPCMADEEXT=mac
ZIPSUFFIX=macos ZIPSUFFIX=macos
DEBUGSYMEXT=.xcoff DEBUGSYMEXT=.xcoff
endif endif
ifeq ($(OS_TARGET),darwin) ifeq ($(OS_TARGET),darwin)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADEEXT=dwn
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.darwin
ZIPSUFFIX=darwin ZIPSUFFIX=darwin
endif endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
FPCMADE=fpcmade$(FPCMADEEXT)
else
FPCMADE=fpcmade.$(FULL_TARGET)
endif
else else
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1 PPUEXT=.pp1
@ -706,6 +720,18 @@ FPCMADE=fpcmade.nw
ZIPSUFFIX=nw ZIPSUFFIX=nw
EXEEXT=.nlm EXEEXT=.nlm
endif endif
ifeq ($(OS_TARGET),netwlibc)
STATICLIBPREFIX=
PPUEXT=.ppu
OEXT=.o
ASMEXT=.s
SMARTEXT=.sl
STATICLIBEXT=.a
SHAREDLIBEXT=.nlm
FPCMADE=fpcmade.nwl
ZIPSUFFIX=nwl
EXEEXT=.nlm
endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT= BATCHEXT=
PPUEXT=.ppu PPUEXT=.ppu
@ -723,7 +749,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO= __missing_command__ ECHO= __missing_command_ECHO
else else
ECHO:=$(firstword $(ECHO)) ECHO:=$(firstword $(ECHO))
endif endif
@ -737,7 +763,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(DATE),) ifeq ($(DATE),)
DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))) DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(DATE),) ifeq ($(DATE),)
DATE= __missing_command__ DATE= __missing_command_DATE
else else
DATE:=$(firstword $(DATE)) DATE:=$(firstword $(DATE))
endif endif
@ -751,7 +777,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(GINSTALL),) ifeq ($(GINSTALL),)
GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH)))) GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(GINSTALL),) ifeq ($(GINSTALL),)
GINSTALL= __missing_command__ GINSTALL= __missing_command_GINSTALL
else else
GINSTALL:=$(firstword $(GINSTALL)) GINSTALL:=$(firstword $(GINSTALL))
endif endif
@ -763,7 +789,7 @@ export GINSTALL
ifndef CPPROG ifndef CPPROG
CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH)))) CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(CPPROG),) ifeq ($(CPPROG),)
CPPROG= __missing_command__ CPPROG= __missing_command_CPPROG
else else
CPPROG:=$(firstword $(CPPROG)) CPPROG:=$(firstword $(CPPROG))
endif endif
@ -772,7 +798,7 @@ export CPPROG
ifndef RMPROG ifndef RMPROG
RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH)))) RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(RMPROG),) ifeq ($(RMPROG),)
RMPROG= __missing_command__ RMPROG= __missing_command_RMPROG
else else
RMPROG:=$(firstword $(RMPROG)) RMPROG:=$(firstword $(RMPROG))
endif endif
@ -781,12 +807,26 @@ export RMPROG
ifndef MVPROG ifndef MVPROG
MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH)))) MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MVPROG),) ifeq ($(MVPROG),)
MVPROG= __missing_command__ MVPROG= __missing_command_MVPROG
else else
MVPROG:=$(firstword $(MVPROG)) MVPROG:=$(firstword $(MVPROG))
endif endif
endif endif
export MVPROG export MVPROG
ifndef MKDIRPROG
MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MKDIRPROG),)
MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MKDIRPROG),)
MKDIRPROG= __missing_command_MKDIRPROG
else
MKDIRPROG:=$(firstword $(MKDIRPROG))
endif
else
MKDIRPROG:=$(firstword $(MKDIRPROG))
endif
endif
export MKDIRPROG
ifndef ECHOREDIR ifndef ECHOREDIR
ifndef inUnix ifndef inUnix
ECHOREDIR=echo ECHOREDIR=echo
@ -798,7 +838,10 @@ ifndef COPY
COPY:=$(CPPROG) -fp COPY:=$(CPPROG) -fp
endif endif
ifndef COPYTREE ifndef COPYTREE
COPYTREE:=$(CPPROG) -rfp COPYTREE:=$(CPPROG) -Rfp
endif
ifndef MKDIRTREE
MKDIRTREE:=$(MKDIRPROG) -p
endif endif
ifndef MOVE ifndef MOVE
MOVE:=$(MVPROG) -f MOVE:=$(MVPROG) -f
@ -830,7 +873,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
ifndef PPUMOVE ifndef PPUMOVE
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH)))) PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(PPUMOVE),) ifeq ($(PPUMOVE),)
PPUMOVE= __missing_command__ PPUMOVE= __missing_command_PPUMOVE
else else
PPUMOVE:=$(firstword $(PPUMOVE)) PPUMOVE:=$(firstword $(PPUMOVE))
endif endif
@ -839,7 +882,7 @@ export PPUMOVE
ifndef FPCMAKE ifndef FPCMAKE
FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH)))) FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(FPCMAKE),) ifeq ($(FPCMAKE),)
FPCMAKE= __missing_command__ FPCMAKE= __missing_command_FPCMAKE
else else
FPCMAKE:=$(firstword $(FPCMAKE)) FPCMAKE:=$(firstword $(FPCMAKE))
endif endif
@ -848,7 +891,7 @@ export FPCMAKE
ifndef ZIPPROG ifndef ZIPPROG
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)))) ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ZIPPROG),) ifeq ($(ZIPPROG),)
ZIPPROG= __missing_command__ ZIPPROG= __missing_command_ZIPPROG
else else
ZIPPROG:=$(firstword $(ZIPPROG)) ZIPPROG:=$(firstword $(ZIPPROG))
endif endif
@ -857,7 +900,7 @@ export ZIPPROG
ifndef TARPROG ifndef TARPROG
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(TARPROG),) ifeq ($(TARPROG),)
TARPROG= __missing_command__ TARPROG= __missing_command_TARPROG
else else
TARPROG:=$(firstword $(TARPROG)) TARPROG:=$(firstword $(TARPROG))
endif endif
@ -958,6 +1001,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -972,6 +1016,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -986,6 +1031,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1000,6 +1046,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1014,6 +1061,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1028,6 +1076,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1038,7 +1087,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1051,6 +1099,7 @@ REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
@ -1062,7 +1111,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1077,6 +1125,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1091,6 +1140,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1105,6 +1155,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1115,7 +1166,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1129,6 +1179,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1142,6 +1193,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1155,6 +1207,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1168,6 +1221,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1178,7 +1232,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1189,7 +1242,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1200,7 +1252,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1211,7 +1262,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1222,7 +1272,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1233,7 +1282,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1247,6 +1295,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1260,6 +1309,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1270,7 +1320,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1281,7 +1330,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1292,7 +1340,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1307,6 +1354,7 @@ REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif endif
@ -1317,7 +1365,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1328,7 +1375,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
@ -1339,16 +1385,25 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
endif
ifeq ($(OS_TARGET),netwlibc)
ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
endif endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(FULL_TARGET)),)
UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET) UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(FULL_TARGET)
else else
UNITDIR_RTL=$(PACKAGEDIR_RTL) UNITDIR_RTL=$(PACKAGEDIR_RTL)
endif endif
@ -1373,8 +1428,8 @@ endif
ifdef REQUIRE_PACKAGES_PASZLIB ifdef REQUIRE_PACKAGES_PASZLIB
PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_PASZLIB),) ifneq ($(PACKAGEDIR_PASZLIB),)
ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(FULL_TARGET)),)
UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET) UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(FULL_TARGET)
else else
UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
endif endif
@ -1399,8 +1454,8 @@ endif
ifdef REQUIRE_PACKAGES_NETDB ifdef REQUIRE_PACKAGES_NETDB
PACKAGEDIR_NETDB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /netdb/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_NETDB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /netdb/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_NETDB),) ifneq ($(PACKAGEDIR_NETDB),)
ifneq ($(wildcard $(PACKAGEDIR_NETDB)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_NETDB)/units/$(FULL_TARGET)),)
UNITDIR_NETDB=$(PACKAGEDIR_NETDB)/$(OS_TARGET) UNITDIR_NETDB=$(PACKAGEDIR_NETDB)/units/$(FULL_TARGET)
else else
UNITDIR_NETDB=$(PACKAGEDIR_NETDB) UNITDIR_NETDB=$(PACKAGEDIR_NETDB)
endif endif
@ -1425,8 +1480,8 @@ endif
ifdef REQUIRE_PACKAGES_LIBASYNC ifdef REQUIRE_PACKAGES_LIBASYNC
PACKAGEDIR_LIBASYNC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libasync/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_LIBASYNC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libasync/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_LIBASYNC),) ifneq ($(PACKAGEDIR_LIBASYNC),)
ifneq ($(wildcard $(PACKAGEDIR_LIBASYNC)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_LIBASYNC)/units/$(FULL_TARGET)),)
UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)/$(OS_TARGET) UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)/units/$(FULL_TARGET)
else else
UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC) UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)
endif endif
@ -1451,8 +1506,8 @@ endif
ifdef REQUIRE_PACKAGES_PTHREADS ifdef REQUIRE_PACKAGES_PTHREADS
PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_PTHREADS),) ifneq ($(PACKAGEDIR_PTHREADS),)
ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/units/$(FULL_TARGET)),)
UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/$(OS_TARGET) UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/units/$(FULL_TARGET)
else else
UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS) UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)
endif endif
@ -1477,8 +1532,8 @@ endif
ifdef REQUIRE_PACKAGES_FCL ifdef REQUIRE_PACKAGES_FCL
PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_FCL),) ifneq ($(PACKAGEDIR_FCL),)
ifneq ($(wildcard $(PACKAGEDIR_FCL)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_FCL)/units/$(FULL_TARGET)),)
UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET) UNITDIR_FCL=$(PACKAGEDIR_FCL)/units/$(FULL_TARGET)
else else
UNITDIR_FCL=$(PACKAGEDIR_FCL) UNITDIR_FCL=$(PACKAGEDIR_FCL)
endif endif
@ -1503,8 +1558,8 @@ endif
ifdef REQUIRE_PACKAGES_PASJPEG ifdef REQUIRE_PACKAGES_PASJPEG
PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_PASJPEG),) ifneq ($(PACKAGEDIR_PASJPEG),)
ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(FULL_TARGET)),)
UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/$(OS_TARGET) UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(FULL_TARGET)
else else
UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)
endif endif
@ -1529,8 +1584,8 @@ endif
ifdef REQUIRE_PACKAGES_IBASE ifdef REQUIRE_PACKAGES_IBASE
PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_IBASE),) ifneq ($(PACKAGEDIR_IBASE),)
ifneq ($(wildcard $(PACKAGEDIR_IBASE)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(FULL_TARGET)),)
UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET) UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(FULL_TARGET)
else else
UNITDIR_IBASE=$(PACKAGEDIR_IBASE) UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
endif endif
@ -1552,11 +1607,37 @@ ifdef UNITDIR_IBASE
override COMPILER_UNITDIR+=$(UNITDIR_IBASE) override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
endif endif
endif endif
ifdef REQUIRE_PACKAGES_POSTGRES
PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_POSTGRES),)
ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(FULL_TARGET)),)
UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(FULL_TARGET)
else
UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_POSTGRES)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_POSTGRES)/$(FPCMADE)
endif
else
PACKAGEDIR_POSTGRES=
UNITDIR_POSTGRES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /postgres/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_POSTGRES),)
UNITDIR_POSTGRES:=$(firstword $(UNITDIR_POSTGRES))
else
UNITDIR_POSTGRES=
endif
endif
ifdef UNITDIR_POSTGRES
override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES)
endif
endif
ifdef REQUIRE_PACKAGES_MYSQL ifdef REQUIRE_PACKAGES_MYSQL
PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_MYSQL),) ifneq ($(PACKAGEDIR_MYSQL),)
ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(FULL_TARGET)),)
UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET) UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(FULL_TARGET)
else else
UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
endif endif
@ -1581,8 +1662,8 @@ endif
ifdef REQUIRE_PACKAGES_SQLITE ifdef REQUIRE_PACKAGES_SQLITE
PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_SQLITE),) ifneq ($(PACKAGEDIR_SQLITE),)
ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/$(OS_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(FULL_TARGET)),)
UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/$(OS_TARGET) UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(FULL_TARGET)
else else
UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)
endif endif
@ -1747,7 +1828,7 @@ override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
endif endif
fpc_units: $(UNITPPUFILES) fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
ifdef TARGET_RSTS ifdef TARGET_RSTS
override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
override CLEANRSTFILES+=$(RSTFILES) override CLEANRSTFILES+=$(RSTFILES)
@ -1762,19 +1843,26 @@ fpc_debug:
$(MAKE) all DEBUG=1 $(MAKE) all DEBUG=1
fpc_release: fpc_release:
$(MAKE) all RELEASE=1 $(MAKE) all RELEASE=1
.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res .SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
$(COMPILER_UNITTARGETDIR):
$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
$(COMPILER_TARGETDIR):
$(MKDIRTREE) $(COMPILER_TARGETDIR)
%$(PPUEXT): %.pp %$(PPUEXT): %.pp
$(COMPILER) $< $(COMPILER) $<
$(EXECPPAS) $(EXECPPAS)
%$(PPUEXT): %.pas %$(PPUEXT): %.pas
$(COMPILER) $< $(COMPILER) $<
$(EXECPPAS) $(EXECPPAS)
%$(EXEEXT): %.pp %$(EXEEXT): %.pp
$(COMPILER) $< $(COMPILER) $<
$(EXECPPAS) $(EXECPPAS)
%$(EXEEXT): %.pas %$(EXEEXT): %.pas
$(COMPILER) $< $(COMPILER) $<
$(EXECPPAS) $(EXECPPAS)
%$(EXEEXT): %.lpr
$(COMPILER) $<
$(EXECPPAS)
%$(EXEEXT): %.dpr %$(EXEEXT): %.dpr
$(COMPILER) $< $(COMPILER) $<
$(EXECPPAS) $(EXECPPAS)
@ -1782,7 +1870,9 @@ fpc_release:
windres -i $< -o $@ windres -i $< -o $@
vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
ifdef INSTALL_UNITS ifdef INSTALL_UNITS
@ -1939,7 +2029,7 @@ endif
ifdef CLEANPPUFILES ifdef CLEANPPUFILES
override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
ifdef DEBUGSYMEXT ifdef DEBUGSYMEXT
override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES)) override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
endif endif
override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES)) override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))) override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
@ -1965,17 +2055,28 @@ ifdef LIB_NAME
endif endif
-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
fpc_distclean: clean fpc_cleanall: $(CLEANTARGET)
ifdef COMPILER_UNITTARGETDIR
TARGETDIRCLEAN=fpc_clean
endif
fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)
ifdef CLEANEXEFILES ifdef CLEANEXEFILES
-$(DEL) $(CLEANEXEFILES) -$(DEL) $(CLEANEXEFILES)
endif endif
ifdef COMPILER_UNITTARGETDIR
ifdef CLEANPPUFILES
-$(DEL) $(CLEANPPUFILES)
endif
ifneq ($(CLEANPPULINKFILES),)
-$(DEL) $(CLEANPPULINKFILES)
endif
ifdef CLEANRSTFILES
-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
endif
endif
-$(DELTREE) units
-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
ifneq ($(PPUEXT),.ppu)
-$(DEL) *.o *.ppu *.a
endif
-$(DELTREE) *$(SMARTEXT) -$(DELTREE) *$(SMARTEXT)
-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-$(DEL) *_ppas$(BATCHEXT) -$(DEL) *_ppas$(BATCHEXT)
ifdef AOUTEXT ifdef AOUTEXT
-$(DEL) *$(AOUTEXT) -$(DEL) *$(AOUTEXT)
@ -1983,6 +2084,7 @@ endif
ifdef DEBUGSYMEXT ifdef DEBUGSYMEXT
-$(DEL) *$(DEBUGSYMEXT) -$(DEL) *$(DEBUGSYMEXT)
endif endif
fpc_distclean: cleanall
.PHONY: fpc_baseinfo .PHONY: fpc_baseinfo
override INFORULES+=fpc_baseinfo override INFORULES+=fpc_baseinfo
fpc_baseinfo: fpc_baseinfo:
@ -2088,6 +2190,7 @@ fpc_makefiles: fpc_makefile fpc_makefile_dirs
debug: fpc_debug debug: fpc_debug
smart: fpc_smart smart: fpc_smart
release: fpc_release release: fpc_release
units: fpc_units
examples: examples:
shared: shared:
install: fpc_install install: fpc_install
@ -2103,7 +2206,7 @@ distclean: fpc_distclean
cleanall: fpc_cleanall cleanall: fpc_cleanall
info: fpc_info info: fpc_info
makefiles: fpc_makefiles makefiles: fpc_makefiles
.PHONY: debug smart release examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles .PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
ifneq ($(wildcard fpcmake.loc),) ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif

4
lcl/lclmemmanager.pas
View File

@ -212,13 +212,13 @@ begin
end; end;
FCurItem:=nil; FCurItem:=nil;
FEndItem:=nil; FEndItem:=nil;
FCurSize:=FItemSize*4; FCurSize:=FItemSize*4; // 4 items
end; end;
constructor TLCLNonFreeMemManager.Create(TheItemSize: integer); constructor TLCLNonFreeMemManager.Create(TheItemSize: integer);
begin begin
FItemSize:=TheItemSize; FItemSize:=TheItemSize;
FFirstSize:=FItemSize*4; FFirstSize:=FItemSize*4; // 4 items
FCurSize:=FFirstSize; FCurSize:=FFirstSize;
end; end;

3
lcl/lclproc.pas
View File

@ -79,6 +79,9 @@ function SendApplicationMessage(Msg: Cardinal; WParam: WParam; LParam: LParam):L
procedure OwnerFormDesignerModified(AComponent: TComponent); procedure OwnerFormDesignerModified(AComponent: TComponent);
procedure FreeThenNil(var AnObject: TObject); procedure FreeThenNil(var AnObject: TObject);
{ the LCL interfaces finalization sections are called before the finalization
sections of the LCL. Those parts, that should be finalized after the LCL, can
be registered here. }
procedure RegisterInterfaceFinalizationHandler(p: TProcedure); procedure RegisterInterfaceFinalizationHandler(p: TProcedure);
procedure CallInterfaceFinalizationHandlers; procedure CallInterfaceFinalizationHandlers;