diff --git a/components/chmhelp/packages/idehelp/Makefile b/components/chmhelp/packages/idehelp/Makefile
index 4d15cd9fe6..8c7c01072d 100644
--- a/components/chmhelp/packages/idehelp/Makefile
+++ b/components/chmhelp/packages/idehelp/Makefile
@@ -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 [2011/01/04]
 #
 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+=chmhelppkg.pas
 endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override TARGET_UNITS+=chmhelppkg.pas
+endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_UNITS+=chmhelppkg.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+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
+endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 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+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../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-linux)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../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-netbsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../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-amiga)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../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)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../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-darwin)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../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-morphos)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../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-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+override COMPILER_UNITDIR+=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
@@ -1259,6 +1274,9 @@ endif
 ifeq ($(FULL_TARGET),i386-nativent)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(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)/chmhelppkg$(PPUEXT)
-all: cleartarget $(COMPILER_UNITTARGETDIR) chmhelppkg$(PPUEXT)
+compiled:
+	$(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/ChmHelpPkg.compiled
+all: cleartarget $(COMPILER_UNITTARGETDIR) chmhelppkg$(PPUEXT) compiled
diff --git a/components/chmhelp/packages/idehelp/Makefile.compiled b/components/chmhelp/packages/idehelp/Makefile.compiled
index e69de29bb2..2b1c8ef9d3 100644
--- a/components/chmhelp/packages/idehelp/Makefile.compiled
+++ b/components/chmhelp/packages/idehelp/Makefile.compiled
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <Makefile Value="True"/>
+  <Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fu../../../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET);../help/lib/%(CPU_TARGET)-%(OS_TARGET);../../../codetools/units/%(CPU_TARGET)-%(OS_TARGET);../../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM) chmhelppkg.pas"/>
+</CONFIG>
diff --git a/components/chmhelp/packages/idehelp/Makefile.fpc b/components/chmhelp/packages/idehelp/Makefile.fpc
index 964d9c577f..37b7af09b0 100644
--- a/components/chmhelp/packages/idehelp/Makefile.fpc
+++ b/components/chmhelp/packages/idehelp/Makefile.fpc
@@ -2,7 +2,7 @@
 #
 #   Makefile.fpc for ChmHelpPkg 0.1
 #
-#   This file was generated on 07/02/2010
+#   This file was generated on 01/06/2011
 
 [package]
 name=chmhelppkg
@@ -10,9 +10,9 @@ version=0.1
 
 [compiler]
 unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
-unitdir=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
-includedir=./
-options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+unitdir=../../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../help/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+includedir=.
+options= -MObjFPC -Scgi -O1 -gl -vewnhi -l -dLCL -dLCL$(LCL_PLATFORM)
 
 [target]
 units=chmhelppkg.pas
@@ -45,9 +45,12 @@ endif
 export LCL_PLATFORM
 
 [rules]
-.PHONY: cleartarget all
+.PHONY: cleartarget compiled all
 
 cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/chmhelppkg$(PPUEXT)
 
-all: cleartarget $(COMPILER_UNITTARGETDIR) chmhelppkg$(PPUEXT)
+compiled:
+        $(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/ChmHelpPkg.compiled
+
+all: cleartarget $(COMPILER_UNITTARGETDIR) chmhelppkg$(PPUEXT) compiled