diff --git a/.gitattributes b/.gitattributes
index 1e8d7e1fb8..4947347d0a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2568,6 +2568,7 @@ components/tachart/tagraph.pas svneol=native#text/plain
components/tachart/taintervalsources.pas svneol=native#text/pascal
components/tachart/talegend.pas svneol=native#text/plain
components/tachart/talegendpanel.pas svneol=native#text/pascal
+components/tachart/tamath.pas svneol=native#text/pascal
components/tachart/tamultiseries.pas svneol=native#text/pascal
components/tachart/tanavigation.pas svneol=native#text/pascal
components/tachart/taprint.pas svneol=native#text/pascal
diff --git a/components/tachart/Makefile b/components/tachart/Makefile
index 78885d3b34..0b1e2f3602 100644
--- a/components/tachart/Makefile
+++ b/components/tachart/Makefile
@@ -1,8 +1,8 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/23]
#
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 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 powerpc-wii 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 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
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifeq ($(OS_TARGET),darwin)
ifeq ($(OS_SOURCE),darwin)
DARWIN2DARWIN=1
endif
@@ -263,30 +263,6 @@ ifeq ($(UNITSDIR),)
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-ifndef FPCFPMAKE
-ifdef CROSSCOMPILE
-ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
-FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(FPCPROG),)
-FPCPROG:=$(firstword $(FPCPROG))
-FPCFPMAKE:=$(shell $(FPCPROG) -PB)
-ifeq ($(strip $(wildcard $(FPCFPMAKE))),)
-FPCFPMAKE:=$(firstword $(FPCPROG))
-endif
-else
-override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-endif
-else
-FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
-FPMAKE_SKIP_CONFIG=-n
-export FPCFPMAKE
-export FPMAKE_SKIP_CONFIG
-endif
-else
-FPMAKE_SKIP_CONFIG=-n
-FPCFPMAKE=$(FPC)
-endif
-endif
override PACKAGE_NAME=tachartlazaruspkg
override PACKAGE_VERSION=1.0
ifndef LCL_PLATFORM
@@ -365,12 +341,6 @@ endif
ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_UNITS+=tachartlazaruspkg.pas
endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=tachartlazaruspkg.pas
endif
@@ -416,9 +386,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_UNITS+=tachartlazaruspkg.pas
endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_UNITS+=tachartlazaruspkg.pas
endif
@@ -554,12 +521,6 @@ endif
ifeq ($(FULL_TARGET),i386-symbian)
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-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
@@ -605,9 +566,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
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),powerpc-wii)
-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),sparc-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
@@ -684,193 +642,184 @@ 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+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
@@ -932,12 +881,6 @@ endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_UNITDIR+=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_UNITDIR+=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_UNITDIR+=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITDIR+=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
@@ -983,9 +926,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_UNITDIR+=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_UNITDIR+=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_UNITDIR+=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
endif
@@ -1121,12 +1061,6 @@ endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
endif
@@ -1172,9 +1106,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
endif
@@ -1577,7 +1508,7 @@ DEBUGSYMEXT=.xcoff
SHORTSUFFIX=mac
IMPORTLIBPREFIX=imp
endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifeq ($(OS_TARGET),darwin)
BATCHEXT=.sh
EXEEXT=
HASSHAREDLIB=1
@@ -1592,15 +1523,6 @@ ifeq ($(OS_TARGET),symbian)
SHAREDLIBEXT=.dll
SHORTSUFFIX=symbian
endif
-ifeq ($(OS_TARGET),NativeNT)
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=nativent
-endif
-ifeq ($(OS_TARGET),wii)
-EXEEXT=.dol
-SHAREDLIBEXT=.so
-SHORTSUFFIX=wii
-endif
else
ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1
@@ -2086,12 +2008,6 @@ endif
ifeq ($(FULL_TARGET),i386-symbian)
REQUIRE_PACKAGES_RTL=1
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
@@ -2137,9 +2053,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
REQUIRE_PACKAGES_RTL=1
endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-REQUIRE_PACKAGES_RTL=1
-endif
ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1
endif
@@ -2223,15 +2136,6 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)
else
UNITDIR_RTL=$(PACKAGEDIR_RTL)
endif
-ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)
-endif
-endif
ifdef CHECKDEPEND
$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
@@ -2249,9 +2153,6 @@ endif
ifdef UNITDIR_RTL
override COMPILER_UNITDIR+=$(UNITDIR_RTL)
endif
-ifdef UNITDIR_FPMAKE_RTL
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
-endif
endif
ifndef NOCPUDEF
override FPCOPTDEF=$(ARCH)
@@ -2364,7 +2265,7 @@ override FPCOPT+=-Aas
endif
endif
ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifneq ($(findstring $(OS_TARGET),linux solaris),)
+ifeq ($(OS_TARGET),linux)
ifeq ($(CPU_TARGET),x86_64)
override FPCOPT+=-Cg
endif
@@ -2741,7 +2642,6 @@ fpc_baseinfo:
@$(ECHO) Full Target.. $(FULL_TARGET)
@$(ECHO) SourceSuffix. $(SOURCESUFFIX)
@$(ECHO) TargetSuffix. $(TARGETSUFFIX)
- @$(ECHO) FPC fpmake... $(FPCFPMAKE)
@$(ECHO)
@$(ECHO) == Directory info ==
@$(ECHO)
diff --git a/components/tachart/Makefile.compiled b/components/tachart/Makefile.compiled
index 436cf7b30d..caa660b4af 100644
--- a/components/tachart/Makefile.compiled
+++ b/components/tachart/Makefile.compiled
@@ -1,5 +1,5 @@
-
+
diff --git a/components/tachart/Makefile.fpc b/components/tachart/Makefile.fpc
index 8ea20a2296..7736cb9ce0 100644
--- a/components/tachart/Makefile.fpc
+++ b/components/tachart/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for TAChartLazarusPkg 1.0
#
-# This file was generated on 29.09.2011
+# This file was generated on 02.10.2011
[package]
name=tachartlazaruspkg
@@ -11,7 +11,7 @@ version=1.0
[compiler]
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
unitdir=numlib_fix editors ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-options= -MObjFPC -Scgi -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+options= -MObjFPC -Scgi -Cr -O1 -g -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
[target]
units=tachartlazaruspkg.pas
diff --git a/components/tachart/tachartaxis.pas b/components/tachart/tachartaxis.pas
index f987170e6c..b777aad6f6 100644
--- a/components/tachart/tachartaxis.pas
+++ b/components/tachart/tachartaxis.pas
@@ -240,7 +240,7 @@ type
implementation
uses
- LResources, Math, PropEdits, TAGeometry;
+ LResources, Math, PropEdits, TAGeometry, TAMath;
var
VIdentityTransform: TChartAxisTransformations;
diff --git a/components/tachart/tachartlazaruspkg.lpk b/components/tachart/tachartlazaruspkg.lpk
index a2a77f51a6..0137e51d23 100644
--- a/components/tachart/tachartlazaruspkg.lpk
+++ b/components/tachart/tachartlazaruspkg.lpk
@@ -17,6 +17,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -30,7 +41,7 @@
for details about the copyright.
"/>
-
+
@@ -183,6 +194,10 @@
+
+
+
+
diff --git a/components/tachart/tachartlazaruspkg.pas b/components/tachart/tachartlazaruspkg.pas
index 075a1831f3..315e6c849b 100644
--- a/components/tachart/tachartlazaruspkg.pas
+++ b/components/tachart/tachartlazaruspkg.pas
@@ -13,7 +13,7 @@ uses
TALegendPanel, TARadialSeries, TACustomSource, TAGeometry, TANavigation,
TADrawerCanvas, TADrawerSVG, TAIntervalSources, TAChartAxisUtils,
TAChartListbox, TAEnumerators, TADataPointsEditor, TAChartExtentLink,
- TAToolEditors, LazarusPackageIntf;
+ TAToolEditors, TAMath, LazarusPackageIntf;
implementation
diff --git a/components/tachart/tachartutils.pas b/components/tachart/tachartutils.pas
index 6411f8f5ed..d3b4ca6301 100644
--- a/components/tachart/tachartutils.pas
+++ b/components/tachart/tachartutils.pas
@@ -260,9 +260,6 @@ function BoundsSize(ALeft, ATop: Integer; ASize: TSize): TRect; inline;
function DoubleInterval(AStart, AEnd: Double): TDoubleInterval; inline;
-procedure EnsureOrder(var A, B: Integer); overload; inline;
-procedure EnsureOrder(var A, B: Double); overload; inline;
-
procedure Exchange(var A, B: Integer); overload; inline;
procedure Exchange(var A, B: Double); overload; inline;
procedure Exchange(var A, B: TDoublePoint); overload; inline;
@@ -284,11 +281,6 @@ function RadToOrient(ARad: Double): Integer; inline;
function RoundChecked(A: Double): Integer; inline;
-function SafeInfinity: Double; inline;
-function SafeInRange(AValue, ABound1, ABound2: Double): Boolean;
-function SafeMin(A, B: Double): Double;
-function SafeNan: Double; inline;
-
procedure SetPropDefaults(AObject: TPersistent; APropNames: array of String);
// Accept both locale-specific and default decimal separators.
@@ -331,18 +323,6 @@ begin
Result.FEnd := AEnd;
end;
-procedure EnsureOrder(var A, B: Integer); overload; inline;
-begin
- if A > B then
- Exchange(A, B);
-end;
-
-procedure EnsureOrder(var A, B: Double); overload; inline;
-begin
- if A > B then
- Exchange(A, B);
-end;
-
procedure Exchange(var A, B: Integer);
var
t: Integer;
@@ -448,40 +428,6 @@ begin
Result := Round(EnsureRange(A, -MaxInt, MaxInt));
end;
-function SafeInfinity: Double;
-begin
- {$PUSH}{$R-}{$Q-}
- Result := Infinity;
- {$POP}
-end;
-
-function SafeInRange(AValue, ABound1, ABound2: Double): Boolean;
-begin
- EnsureOrder(ABound1, ABound2);
- Result := InRange(AValue, ABound1, ABound2);
-end;
-
-function SafeMin(A, B: Double): Double;
-begin
- if IsNan(A) then
- Result := B
- else if IsNan(B) then
- Result := A
- else if A < B then
- Result := A
- else
- Result := B;
-end;
-
-function SafeNan: Double;
-begin
- {$PUSH}{$R-}{$Q-}
- Result := NaN;
- {$POP}
-end;
-
-{$HINTS OFF}
-
procedure SetPropDefaults(AObject: TPersistent; APropNames: array of String);
var
n: String;
@@ -505,6 +451,7 @@ begin
Result := 0.0;
end;
+{$HINTS OFF}
procedure Unused(const A1);
begin
end;
diff --git a/components/tachart/tacustomseries.pas b/components/tachart/tacustomseries.pas
index afe1cb4e9b..2e34c41658 100644
--- a/components/tachart/tacustomseries.pas
+++ b/components/tachart/tacustomseries.pas
@@ -248,7 +248,7 @@ type
implementation
uses
- Math, PropEdits, TAGeometry, Types;
+ Math, PropEdits, TAGeometry, TAMath, Types;
{ TCustomChartSeries }
diff --git a/components/tachart/tacustomsource.pas b/components/tachart/tacustomsource.pas
index b73f3234a9..dfd1eb3feb 100644
--- a/components/tachart/tacustomsource.pas
+++ b/components/tachart/tacustomsource.pas
@@ -205,7 +205,7 @@ procedure SetDataItemDefaults(var AItem: TChartDataItem);
implementation
uses
- Math, StrUtils, SysUtils;
+ Math, StrUtils, SysUtils, TAMath;
procedure SetDataItemDefaults(var AItem: TChartDataItem);
var
diff --git a/components/tachart/tafuncseries.pas b/components/tachart/tafuncseries.pas
index b14f5a95b7..6173a2ba63 100644
--- a/components/tachart/tafuncseries.pas
+++ b/components/tachart/tafuncseries.pas
@@ -250,7 +250,7 @@ type
implementation
uses
- ipf, Math, SysUtils, TAGeometry, TAGraph;
+ ipf, Math, SysUtils, TAGeometry, TAGraph, TAMath;
type
TMakeDoublePoint = function (AX, AY: Double): TDoublePoint;
diff --git a/components/tachart/tageometry.pas b/components/tachart/tageometry.pas
index aee1a187d1..ac1ed56b4b 100644
--- a/components/tachart/tageometry.pas
+++ b/components/tachart/tageometry.pas
@@ -80,7 +80,7 @@ operator :=(const ASize: TSize): TPoint; inline;
implementation
uses
- Math;
+ Math, TAMath;
function PointLineSide(AP, A1, A2: TPoint): TValueSign; forward;
diff --git a/components/tachart/tagraph.pas b/components/tachart/tagraph.pas
index ed4208e5dd..c79f147a67 100644
--- a/components/tachart/tagraph.pas
+++ b/components/tachart/tagraph.pas
@@ -415,7 +415,7 @@ implementation
uses
Clipbrd, Dialogs, GraphMath, LCLProc, LResources, Math, TADrawerCanvas,
- TAGeometry, Types;
+ TAGeometry, TAMath, Types;
function CompareZPosition(AItem1, AItem2: Pointer): Integer;
begin
diff --git a/components/tachart/taintervalsources.pas b/components/tachart/taintervalsources.pas
index 9a9eef552c..c31b85f7d9 100644
--- a/components/tachart/taintervalsources.pas
+++ b/components/tachart/taintervalsources.pas
@@ -82,7 +82,7 @@ procedure Register;
implementation
uses
- DateUtils, Math, StrUtils, SysUtils;
+ DateUtils, Math, StrUtils, SysUtils, TAMath;
const
YEAR = 365.25;
diff --git a/components/tachart/tamath.pas b/components/tachart/tamath.pas
new file mode 100644
index 0000000000..35f0391462
--- /dev/null
+++ b/components/tachart/tamath.pas
@@ -0,0 +1,84 @@
+{
+
+ *****************************************************************************
+ * *
+ * See the file COPYING.modifiedLGPL.txt, included in this distribution, *
+ * for details about the copyright. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
+ * *
+ *****************************************************************************
+
+ Authors: Alexander Klenin
+
+}
+unit TAMath;
+
+{$H+}
+
+interface
+
+uses
+ Classes, SysUtils;
+
+procedure EnsureOrder(var A, B: Integer); overload; inline;
+procedure EnsureOrder(var A, B: Double); overload; inline;
+
+function SafeInfinity: Double; inline;
+function SafeInRange(AValue, ABound1, ABound2: Double): Boolean;
+function SafeMin(A, B: Double): Double;
+function SafeNan: Double; inline;
+
+implementation
+
+uses
+ Math, TAChartUtils;
+
+procedure EnsureOrder(var A, B: Integer); overload; inline;
+begin
+ if A > B then
+ Exchange(A, B);
+end;
+
+procedure EnsureOrder(var A, B: Double); overload; inline;
+begin
+ if A > B then
+ Exchange(A, B);
+end;
+
+function SafeInfinity: Double;
+begin
+ {$PUSH}{$R-}{$Q-}
+ Result := Infinity;
+ {$POP}
+end;
+
+function SafeInRange(AValue, ABound1, ABound2: Double): Boolean;
+begin
+ EnsureOrder(ABound1, ABound2);
+ Result := InRange(AValue, ABound1, ABound2);
+end;
+
+function SafeMin(A, B: Double): Double;
+begin
+ if IsNan(A) then
+ Result := B
+ else if IsNan(B) then
+ Result := A
+ else if A < B then
+ Result := A
+ else
+ Result := B;
+end;
+
+function SafeNan: Double;
+begin
+ {$PUSH}{$R-}{$Q-}
+ Result := NaN;
+ {$POP}
+end;
+
+end.
+
diff --git a/components/tachart/tasources.pas b/components/tachart/tasources.pas
index 4e2023544d..5b3048877a 100644
--- a/components/tachart/tasources.pas
+++ b/components/tachart/tasources.pas
@@ -222,7 +222,7 @@ procedure Register;
implementation
uses
- Math, StrUtils, SysUtils;
+ Math, StrUtils, SysUtils, TAMath;
type
diff --git a/components/tachart/tatransformations.pas b/components/tachart/tatransformations.pas
index e3ed73febd..07de65b6d4 100644
--- a/components/tachart/tatransformations.pas
+++ b/components/tachart/tatransformations.pas
@@ -201,7 +201,7 @@ implementation
uses
ComponentEditors, Forms, Math, PropEdits,
- TASubcomponentsEditor;
+ TAMath, TASubcomponentsEditor;
type
{ TAxisTransformsComponentEditor }
diff --git a/components/tachart/test/SourcesTest.pas b/components/tachart/test/SourcesTest.pas
index 116ebec04b..6f07c89572 100644
--- a/components/tachart/test/SourcesTest.pas
+++ b/components/tachart/test/SourcesTest.pas
@@ -68,7 +68,7 @@ type
implementation
uses
- Math, TAChartUtils, TACustomSource;
+ Math, TAChartUtils, TACustomSource, TAMath;
{ TCalculatedSourceTest }