mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-14 20:39:09 +02:00
IDE: adding include path to makefiles for packages
git-svn-id: trunk@9943 -
This commit is contained in:
parent
8685e116f7
commit
2cdabd7f91
@ -1,8 +1,8 @@
|
|||||||
#
|
#
|
||||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/06/19]
|
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
|
||||||
#
|
#
|
||||||
default: all
|
default: all
|
||||||
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
|
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
|
||||||
BSDs = freebsd netbsd openbsd darwin
|
BSDs = freebsd netbsd openbsd darwin
|
||||||
UNIXs = linux $(BSDs) solaris qnx
|
UNIXs = linux $(BSDs) solaris qnx
|
||||||
LIMIT83fs = go32v2 os2 emx watcom
|
LIMIT83fs = go32v2 os2 emx watcom
|
||||||
@ -317,6 +317,9 @@ endif
|
|||||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||||
override TARGET_UNITS+=printer4lazarus.pas
|
override TARGET_UNITS+=printer4lazarus.pas
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||||
|
override TARGET_UNITS+=printer4lazarus.pas
|
||||||
|
endif
|
||||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||||
override TARGET_UNITS+=printer4lazarus.pas
|
override TARGET_UNITS+=printer4lazarus.pas
|
||||||
endif
|
endif
|
||||||
@ -437,6 +440,9 @@ endif
|
|||||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||||
|
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||||
|
endif
|
||||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||||
endif
|
endif
|
||||||
@ -557,6 +563,9 @@ endif
|
|||||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||||
override COMPILER_OPTIONS+=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
override COMPILER_OPTIONS+=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||||
|
override COMPILER_OPTIONS+=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
||||||
|
endif
|
||||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||||
override COMPILER_OPTIONS+=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
override COMPILER_OPTIONS+=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
||||||
endif
|
endif
|
||||||
@ -600,6 +609,129 @@ ifeq ($(FULL_TARGET),powerpc64-linux)
|
|||||||
override COMPILER_OPTIONS+=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
override COMPILER_OPTIONS+=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
||||||
endif
|
endif
|
||||||
ifeq ($(FULL_TARGET),i386-linux)
|
ifeq ($(FULL_TARGET),i386-linux)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-go32v2)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-win32)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-os2)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-freebsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-beos)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-solaris)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-qnx)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-netware)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-openbsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-wdosx)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-darwin)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-emx)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-watcom)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-netwlibc)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-wince)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),m68k-linux)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),m68k-freebsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),m68k-netbsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),m68k-amiga)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),m68k-atari)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),m68k-openbsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),m68k-palmos)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-linux)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-darwin)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-morphos)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),sparc-linux)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),sparc-netbsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),sparc-solaris)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),x86_64-linux)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),x86_64-freebsd)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),x86_64-win64)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),arm-linux)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),arm-palmos)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),arm-wince)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),arm-gba)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||||
|
override COMPILER_INCLUDEDIR+=unix/ win32/
|
||||||
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),i386-linux)
|
||||||
override COMPILER_UNITDIR+=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
override COMPILER_UNITDIR+=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
||||||
endif
|
endif
|
||||||
ifeq ($(FULL_TARGET),i386-go32v2)
|
ifeq ($(FULL_TARGET),i386-go32v2)
|
||||||
@ -677,6 +809,9 @@ endif
|
|||||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||||
override COMPILER_UNITDIR+=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
override COMPILER_UNITDIR+=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||||
|
override COMPILER_UNITDIR+=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
||||||
|
endif
|
||||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||||
override COMPILER_UNITDIR+=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
override COMPILER_UNITDIR+=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
||||||
endif
|
endif
|
||||||
@ -797,6 +932,9 @@ endif
|
|||||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||||
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
|
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||||
|
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
|
||||||
|
endif
|
||||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||||
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
|
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
|
||||||
endif
|
endif
|
||||||
@ -1233,7 +1371,7 @@ endif
|
|||||||
ifeq ($(OS_TARGET),amiga)
|
ifeq ($(OS_TARGET),amiga)
|
||||||
EXEEXT=
|
EXEEXT=
|
||||||
PPUEXT=.ppu
|
PPUEXT=.ppu
|
||||||
ASMEXT=.asm
|
ASMEXT=.s
|
||||||
OEXT=.o
|
OEXT=.o
|
||||||
SMARTEXT=.sl
|
SMARTEXT=.sl
|
||||||
STATICLIBEXT=.a
|
STATICLIBEXT=.a
|
||||||
@ -1661,6 +1799,9 @@ endif
|
|||||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||||
|
REQUIRE_PACKAGES_RTL=1
|
||||||
|
endif
|
||||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
endif
|
endif
|
||||||
@ -1780,7 +1921,7 @@ ifeq ($(CPU_TARGET),powerpc)
|
|||||||
FPCCPUOPT:=-O1r
|
FPCCPUOPT:=-O1r
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
FPCCPUOPT:=-O2
|
FPCCPUOPT:=-O1r
|
||||||
endif
|
endif
|
||||||
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
|
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
|
||||||
override FPCOPTDEF+=RELEASE
|
override FPCOPTDEF+=RELEASE
|
||||||
|
@ -7,6 +7,7 @@ version=0.5
|
|||||||
[compiler]
|
[compiler]
|
||||||
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
|
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
|
||||||
unitdir=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
unitdir=unix/ win32/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
|
||||||
|
includedir=unix/ win32/
|
||||||
options=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
options=-dUseCache -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
|
||||||
|
|
||||||
[target]
|
[target]
|
||||||
|
@ -74,7 +74,7 @@ procedure Register;
|
|||||||
implementation
|
implementation
|
||||||
|
|
||||||
{$IFDEF UNIX}
|
{$IFDEF UNIX}
|
||||||
uses Controls, udlgSelectPrinter,udlgpropertiesprinter, FileUtil, StrUtils;
|
uses Controls, udlgSelectPrinter,udlgpropertiesprinter, FileUtil;
|
||||||
{$I ./unix/cupsprndialogs.inc}
|
{$I ./unix/cupsprndialogs.inc}
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
|
@ -51,7 +51,6 @@ end;
|
|||||||
function TPrintDialog.Execute: Boolean;
|
function TPrintDialog.Execute: Boolean;
|
||||||
Var
|
Var
|
||||||
Dlg : TdlgSelectPrinter;
|
Dlg : TdlgSelectPrinter;
|
||||||
s : String;
|
|
||||||
i : Integer;
|
i : Integer;
|
||||||
begin
|
begin
|
||||||
Dlg:=TdlgSelectPrinter.Create(nil);
|
Dlg:=TdlgSelectPrinter.Create(nil);
|
||||||
|
@ -1189,7 +1189,6 @@ End;
|
|||||||
procedure TSourceEditor.FindNextWordOccurrence(DirectionForward: boolean);
|
procedure TSourceEditor.FindNextWordOccurrence(DirectionForward: boolean);
|
||||||
var
|
var
|
||||||
StartX, EndX: Integer;
|
StartX, EndX: Integer;
|
||||||
Word: String;
|
|
||||||
Flags: TSynSearchOptions;
|
Flags: TSynSearchOptions;
|
||||||
LogCaret: TPoint;
|
LogCaret: TPoint;
|
||||||
begin
|
begin
|
||||||
|
@ -273,7 +273,7 @@ var
|
|||||||
IDEMenuRoots: TIDEMenuRoots = nil;// created by the IDE
|
IDEMenuRoots: TIDEMenuRoots = nil;// created by the IDE
|
||||||
|
|
||||||
// IDE MainMenu
|
// IDE MainMenu
|
||||||
mnuMain: TIDEMenuSection;
|
mnuMain: TIDEMenuSection = nil;
|
||||||
|
|
||||||
// file menu
|
// file menu
|
||||||
mnuFile: TIDEMenuSection;
|
mnuFile: TIDEMenuSection;
|
||||||
@ -359,7 +359,7 @@ var
|
|||||||
itmInfoHelps: TIDEMenuSection;
|
itmInfoHelps: TIDEMenuSection;
|
||||||
|
|
||||||
// Source Editor: Popupmenu
|
// Source Editor: Popupmenu
|
||||||
SourceEditorMenuRoot: TIDEMenuSection;
|
SourceEditorMenuRoot: TIDEMenuSection = nil;
|
||||||
// Source Editor: First dynamic section for often used context sensitive stuff
|
// Source Editor: First dynamic section for often used context sensitive stuff
|
||||||
// The items are cleared automatically after each popup.
|
// The items are cleared automatically after each popup.
|
||||||
SrcEditMenuSectionFirstDynamic: TIDEMenuSection;
|
SrcEditMenuSectionFirstDynamic: TIDEMenuSection;
|
||||||
@ -390,13 +390,13 @@ var
|
|||||||
SrcEditSubMenuRefactor: TIDEMenuSection;
|
SrcEditSubMenuRefactor: TIDEMenuSection;
|
||||||
|
|
||||||
// Messages window popupmenu
|
// Messages window popupmenu
|
||||||
MessagesMenuRoot: TIDEMenuSection;
|
MessagesMenuRoot: TIDEMenuSection = nil;
|
||||||
|
|
||||||
// CodeExplorer window popupmenu
|
// CodeExplorer window popupmenu
|
||||||
CodeExplorerMenuRoot: TIDEMenuSection;
|
CodeExplorerMenuRoot: TIDEMenuSection = nil;
|
||||||
|
|
||||||
// Messages window popupmenu
|
// Code templates popupmenu
|
||||||
CodeTemplatesMenuRoot: TIDEMenuSection;
|
CodeTemplatesMenuRoot: TIDEMenuSection = nil;
|
||||||
|
|
||||||
function RegisterIDEMenuRoot(const Name: string; MenuItem: TMenuItem = nil
|
function RegisterIDEMenuRoot(const Name: string; MenuItem: TMenuItem = nil
|
||||||
): TIDEMenuSection;
|
): TIDEMenuSection;
|
||||||
|
@ -1225,6 +1225,7 @@ var
|
|||||||
CodeBuffer: TCodeBuffer;
|
CodeBuffer: TCodeBuffer;
|
||||||
MainSrcFile: String;
|
MainSrcFile: String;
|
||||||
CustomOptions: String;
|
CustomOptions: String;
|
||||||
|
IncPath: String;
|
||||||
begin
|
begin
|
||||||
Result:=mrCancel;
|
Result:=mrCancel;
|
||||||
PathDelimNeedsReplace:=PathDelim<>'/';
|
PathDelimNeedsReplace:=PathDelim<>'/';
|
||||||
@ -1233,6 +1234,8 @@ begin
|
|||||||
MainUnitName:=lowercase(ExtractFileNameOnly((SrcFilename)));
|
MainUnitName:=lowercase(ExtractFileNameOnly((SrcFilename)));
|
||||||
UnitPath:=APackage.CompilerOptions.GetUnitPath(true,
|
UnitPath:=APackage.CompilerOptions.GetUnitPath(true,
|
||||||
coptParsedPlatformIndependent);
|
coptParsedPlatformIndependent);
|
||||||
|
IncPath:=APackage.CompilerOptions.GetIncludePath(true,
|
||||||
|
coptParsedPlatformIndependent);
|
||||||
UnitOutputPath:=APackage.CompilerOptions.GetUnitOutPath(true,
|
UnitOutputPath:=APackage.CompilerOptions.GetUnitOutPath(true,
|
||||||
coptParsedPlatformIndependent);
|
coptParsedPlatformIndependent);
|
||||||
CustomOptions:=APackage.CompilerOptions.GetCustomOptions(
|
CustomOptions:=APackage.CompilerOptions.GetCustomOptions(
|
||||||
@ -1245,6 +1248,7 @@ begin
|
|||||||
|
|
||||||
//DebugLn('TPkgManager.DoWriteMakefile ',APackage.Name,' makefile UnitPath="',UnitPath,'"');
|
//DebugLn('TPkgManager.DoWriteMakefile ',APackage.Name,' makefile UnitPath="',UnitPath,'"');
|
||||||
UnitPath:=ConvertLazarusToMakefileSearchPath(UnitPath);
|
UnitPath:=ConvertLazarusToMakefileSearchPath(UnitPath);
|
||||||
|
IncPath:=ConvertLazarusToMakefileSearchPath(IncPath);
|
||||||
// remove path delimiter at the end, or else it will fail on windows
|
// remove path delimiter at the end, or else it will fail on windows
|
||||||
UnitOutputPath:=ConvertLazarusToMakefileDirectory(
|
UnitOutputPath:=ConvertLazarusToMakefileDirectory(
|
||||||
ChompPathDelim(UnitOutputPath));
|
ChompPathDelim(UnitOutputPath));
|
||||||
@ -1262,7 +1266,10 @@ begin
|
|||||||
s:=s+''+e;
|
s:=s+''+e;
|
||||||
s:=s+'[compiler]'+e;
|
s:=s+'[compiler]'+e;
|
||||||
s:=s+'unittargetdir='+UnitOutputPath+e;
|
s:=s+'unittargetdir='+UnitOutputPath+e;
|
||||||
|
if UnitPath<>'' then
|
||||||
s:=s+'unitdir='+UnitPath+e;
|
s:=s+'unitdir='+UnitPath+e;
|
||||||
|
if IncPath<>'' then
|
||||||
|
s:=s+'includedir='+IncPath+e;
|
||||||
s:=s+'options='+CustomOptions+e; // ToDo do the other options
|
s:=s+'options='+CustomOptions+e; // ToDo do the other options
|
||||||
s:=s+''+e;
|
s:=s+''+e;
|
||||||
s:=s+'[target]'+e;
|
s:=s+'[target]'+e;
|
||||||
|
Loading…
Reference in New Issue
Block a user