mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-08 02:55:55 +02:00
codetools: class completion: fixed inserting new methods into implementation with only a begin
git-svn-id: trunk@28618 -
This commit is contained in:
mattias
parent
6cee875ace
commit
b55cf19954
@ -1,8 +1,8 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/06/03]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/12/03]
|
||||
#
|
||||
default: all
|
||||
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
|
||||
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
|
||||
BSDs = freebsd netbsd openbsd darwin
|
||||
UNIXs = linux $(BSDs) solaris qnx haiku
|
||||
LIMIT83fs = go32v2 os2 emx watcom
|
||||
@ -244,7 +244,7 @@ endif
|
||||
ifndef CROSSBINDIR
|
||||
CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
|
||||
endif
|
||||
ifeq ($(OS_TARGET),darwin)
|
||||
ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
|
||||
ifeq ($(OS_SOURCE),darwin)
|
||||
DARWIN2DARWIN=1
|
||||
endif
|
||||
@ -344,6 +344,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-nativent)
|
||||
override TARGET_UNITS+=codetools.pas
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
override TARGET_UNITS+=codetools.pas
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override TARGET_UNITS+=codetools.pas
|
||||
endif
|
||||
@ -527,6 +530,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-nativent)
|
||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
endif
|
||||
@ -648,553 +654,562 @@ ifeq ($(FULL_TARGET),mipsel-linux)
|
||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-go32v2)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-win32)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-os2)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-freebsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-solaris)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-qnx)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netware)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-openbsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wdosx)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-darwin)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-emx)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-watcom)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netwlibc)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wince)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-symbian)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-nativent)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-freebsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-netbsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-amiga)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-atari)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-openbsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-palmos)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-darwin)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-morphos)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-netbsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-solaris)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-freebsd)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-solaris)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-darwin)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-win64)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-palmos)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-darwin)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-wince)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-gba)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-nds)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-symbian)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-darwin)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),avr-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),armeb-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),armeb-embedded)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-linux)
|
||||
override COMPILER_OPTIONS+=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-go32v2)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-win32)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-os2)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-freebsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-solaris)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-qnx)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netware)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-openbsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wdosx)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-darwin)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-emx)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-watcom)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netwlibc)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wince)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-symbian)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-nativent)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-freebsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-netbsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-amiga)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-atari)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-openbsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-palmos)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-darwin)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-morphos)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-netbsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-solaris)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-freebsd)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-solaris)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-darwin)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-win64)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-palmos)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-darwin)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-wince)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-gba)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-nds)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-symbian)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-darwin)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),avr-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),armeb-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),armeb-embedded)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-linux)
|
||||
override COMPILER_INCLUDEDIR+=./
|
||||
override COMPILER_INCLUDEDIR+=.
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-go32v2)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-win32)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-os2)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-freebsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-solaris)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-qnx)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netware)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-openbsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wdosx)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-darwin)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-emx)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-watcom)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netwlibc)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wince)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-symbian)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-nativent)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-freebsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-netbsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-amiga)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-atari)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-openbsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-palmos)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-amiga)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-darwin)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-morphos)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-netbsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-solaris)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-freebsd)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-solaris)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-darwin)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-win64)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-palmos)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-darwin)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-wince)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-gba)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-nds)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-symbian)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-darwin)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),avr-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),armeb-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),armeb-embedded)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-linux)
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
@ -1259,6 +1274,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-nativent)
|
||||
override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
endif
|
||||
@ -1706,7 +1724,7 @@ DEBUGSYMEXT=.xcoff
|
||||
SHORTSUFFIX=mac
|
||||
IMPORTLIBPREFIX=imp
|
||||
endif
|
||||
ifeq ($(OS_TARGET),darwin)
|
||||
ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
|
||||
BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
@ -2213,6 +2231,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-nativent)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
endif
|
||||
@ -2957,7 +2978,9 @@ makefiles: fpc_makefiles
|
||||
ifneq ($(wildcard fpcmake.loc),)
|
||||
include fpcmake.loc
|
||||
endif
|
||||
.PHONY: cleartarget all
|
||||
.PHONY: cleartarget compiled all
|
||||
cleartarget:
|
||||
-$(DEL) $(COMPILER_UNITTARGETDIR)/codetools$(PPUEXT)
|
||||
all: cleartarget $(COMPILER_UNITTARGETDIR) codetools$(PPUEXT)
|
||||
compiled:
|
||||
$(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/CodeTools.compiled
|
||||
all: cleartarget $(COMPILER_UNITTARGETDIR) codetools$(PPUEXT) compiled
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0"?>
|
||||
<CONFIG>
|
||||
<Makefile Value="True"/>
|
||||
<Params Value=" -MObjFPC -Sci -O1 -gl -vewni -l -Fu../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter"/>
|
||||
</CONFIG>
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Makefile.fpc for CodeTools 1.0.1
|
||||
#
|
||||
# This file was generated on 07/02/2010
|
||||
# This file was generated on 12/04/2010
|
||||
|
||||
[package]
|
||||
name=codetools
|
||||
@ -10,9 +10,9 @@ version=1.0.1
|
||||
|
||||
[compiler]
|
||||
unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
unitdir=../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
|
||||
includedir=./
|
||||
options=-gh -gl -dVerboseIndenter -dEnableBuildModes -dVerboseBug16168 -MObjFPC -Sci
|
||||
unitdir=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
includedir=.
|
||||
options= -MObjFPC -Sci -O1 -gl -vewni -l -gh -gt -gl -dVerboseIndenter -dQT_NATIVE_DIALOGS -dWithSynOverviewGutter
|
||||
|
||||
[target]
|
||||
units=codetools.pas
|
||||
@ -45,9 +45,12 @@ endif
|
||||
export LCL_PLATFORM
|
||||
|
||||
[rules]
|
||||
.PHONY: cleartarget all
|
||||
.PHONY: cleartarget compiled all
|
||||
|
||||
cleartarget:
|
||||
-$(DEL) $(COMPILER_UNITTARGETDIR)/codetools$(PPUEXT)
|
||||
|
||||
all: cleartarget $(COMPILER_UNITTARGETDIR) codetools$(PPUEXT)
|
||||
compiled:
|
||||
$(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/CodeTools.compiled
|
||||
|
||||
all: cleartarget $(COMPILER_UNITTARGETDIR) codetools$(PPUEXT) compiled
|
||||
|
||||
@ -157,7 +157,7 @@ type
|
||||
function InsertMissingClassSemicolons: boolean;
|
||||
function InsertAllNewUnitsToMainUsesSection: boolean;
|
||||
function FindClassMethodsComment(StartPos: integer;
|
||||
out CommentStart, CommentEnd: TCodeXYPosition): boolean;
|
||||
out CommentStart, CommentEnd: integer): boolean;
|
||||
function CreateMissingProcBodies: boolean;
|
||||
function ApplyChangesAndJumpToFirstNewProc(CleanPos: integer;
|
||||
OldTopLine: integer;
|
||||
@ -4898,8 +4898,6 @@ var
|
||||
FromPos: LongInt;
|
||||
ToPos: LongInt;
|
||||
FirstGroup: Boolean;
|
||||
CommentStart: TCodeXYPosition;
|
||||
CommentEnd: TCodeXYPosition;
|
||||
CommentEndPos: integer;
|
||||
CommentStartPos: integer;
|
||||
ProcDefNodes: TAVLTree;
|
||||
@ -4941,15 +4939,12 @@ begin
|
||||
debugln(['TCodeCompletionCodeTool.RemoveEmptyMethods ',dbgstr(copy(Src,FromPos,ToPos-FromPos))]);
|
||||
{$ENDIF}
|
||||
if AllRemoved and FirstGroup
|
||||
and FindClassMethodsComment(FromPos,CommentStart,CommentEnd) then begin
|
||||
and FindClassMethodsComment(FromPos,CommentStartPos,CommentEndPos) then begin
|
||||
// all method bodies will be removed => remove the default comment too
|
||||
if CaretToCleanPos(CommentEnd,CommentEndPos)=0 then begin
|
||||
if FindNextNonSpace(Src,CommentEndPos)>=FromPos then begin
|
||||
// the default comment is directly in front
|
||||
// => remove it too
|
||||
if CaretToCleanPos(CommentStart,CommentStartPos)=0 then
|
||||
FromPos:=FindLineEndOrCodeInFrontOfPosition(CommentStartPos,true);
|
||||
end;
|
||||
if FindNextNonSpace(Src,CommentEndPos)>=FromPos then begin
|
||||
// the default comment is directly in front
|
||||
// => remove it too
|
||||
FromPos:=FindLineEndOrCodeInFrontOfPosition(CommentStartPos,true);
|
||||
end;
|
||||
end;
|
||||
if not SourceChangeCache.Replace(gtNone,gtNone,FromPos,ToPos,'') then
|
||||
@ -6292,17 +6287,15 @@ begin
|
||||
end;
|
||||
|
||||
function TCodeCompletionCodeTool.FindClassMethodsComment(StartPos: integer; out
|
||||
CommentStart, CommentEnd: TCodeXYPosition): boolean;
|
||||
CommentStart, CommentEnd: integer): boolean;
|
||||
var
|
||||
InsertXYPos: TCodeXYPosition;
|
||||
Code: String;
|
||||
begin
|
||||
Result:=false;
|
||||
if not CleanPosToCaret(StartPos,InsertXYPos) then exit;
|
||||
Code:=ExtractClassName(CodeCompleteClassNode,false);
|
||||
// search the comment
|
||||
Result:=FindCommentInFront(InsertXYPos,Code,false,true,false,false,true,true,
|
||||
CommentStart,CommentEnd)
|
||||
Result:=FindCommentInFront(StartPos,Code,false,true,false,true,true,
|
||||
CommentStart,CommentEnd)
|
||||
end;
|
||||
|
||||
procedure TCodeCompletionCodeTool.AddNewPropertyAccessMethodsToClassProcs(
|
||||
@ -6635,8 +6628,12 @@ var
|
||||
RaiseException(ctsImplementationNodeNotFound);
|
||||
if (ImplementationNode.FirstChild=nil)
|
||||
or (ImplementationNode.FirstChild.Desc=ctnBeginBlock) then begin
|
||||
// implementation is empty
|
||||
Indent:=GetLineIndent(Src,ImplementationNode.StartPos);
|
||||
InsertPos:=ImplementationNode.EndPos;
|
||||
if ImplementationNode.FirstChild<>nil then
|
||||
InsertPos:=ImplementationNode.FirstChild.StartPos
|
||||
else
|
||||
InsertPos:=ImplementationNode.EndPos;
|
||||
exit;
|
||||
end;
|
||||
StartSearchProc:=ImplementationNode.FirstChild;
|
||||
@ -6710,7 +6707,8 @@ var
|
||||
|
||||
procedure InsertClassMethodsComment(InsertPos, Indent: integer);
|
||||
var
|
||||
CommentStart, CommentEnd: TCodeXYPosition;
|
||||
CommentStartPos: integer;
|
||||
CommentEndPos: integer;
|
||||
begin
|
||||
// insert class comment
|
||||
if ClassProcs.Count=0 then exit;
|
||||
@ -6719,13 +6717,10 @@ var
|
||||
exit;
|
||||
// find the start of the class (the position in front of the class name)
|
||||
// check if there is already a comment in front
|
||||
if FindClassMethodsComment(InsertPos,CommentStart,CommentEnd) then begin
|
||||
if FindClassMethodsComment(InsertPos,CommentStartPos,CommentEndPos) then begin
|
||||
// comment already exists
|
||||
exit;
|
||||
end;
|
||||
if CommentStart.Code=nil then ;
|
||||
if CommentEnd.Code=nil then ;
|
||||
|
||||
ClassStartComment:=GetIndentStr(Indent)
|
||||
+'{ '+ExtractClassName(CodeCompleteClassNode,false)+' }';
|
||||
ASourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,InsertPos,InsertPos,
|
||||
@ -6823,6 +6818,7 @@ begin
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingProcBodies Starting class in implementation ');
|
||||
{$ENDIF}
|
||||
FindInsertPointForNewClass(InsertPos,Indent);
|
||||
//debugln(['TCodeCompletionCodeTool.CreateMissingProcBodies InsertPos=',dbgstr(copy(Src,InsertPos-10,10)),'|',dbgstr(copy(Src,InsertPos,10))]);
|
||||
InsertClassMethodsComment(InsertPos,Indent);
|
||||
|
||||
// insert all proc bodies
|
||||
|
||||
@ -2799,6 +2799,7 @@ begin
|
||||
APackage.LastCompilerFileDate:=XMLConfig.GetValue('Compiler/Date',0);
|
||||
APackage.LastCompilerParams:=XMLConfig.GetValue('Params/Value','');
|
||||
APackage.LastCompileComplete:=XMLConfig.GetValue('Complete/Value',true);
|
||||
// XMLConfig.GetValue('Makefile/Value',False);
|
||||
finally
|
||||
XMLConfig.Free;
|
||||
end;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user