diff --git a/ideintf/Makefile b/ideintf/Makefile
index 554d46f785..53559f02e6 100644
--- a/ideintf/Makefile
+++ b/ideintf/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/10/17]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/11]
 #
 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 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 mips-linux mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@@ -152,12 +152,6 @@ ifdef OS_TARGET_DEFAULT
 OS_TARGET=$(OS_TARGET_DEFAULT)
 endif
 endif
-ifneq ($(words $(FPC_COMPILERINFO)),5)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
-endif
 ifndef CPU_SOURCE
 CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
 endif
@@ -501,6 +495,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_UNITS+=ideintf.pas
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override TARGET_UNITS+=ideintf.pas
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override TARGET_UNITS+=ideintf.pas
 endif
@@ -690,197 +687,395 @@ endif
 ifeq ($(FULL_TARGET),armeb-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),mips-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),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 -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+endif
+ifeq ($(FULL_TARGET),mips-linux)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-haiku)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-nativent)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),armeb-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),armeb-embedded)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),mips-linux)
+override COMPILER_INCLUDEDIR+=images
+endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override COMPILER_INCLUDEDIR+=images
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
@@ -1068,197 +1263,203 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+endif
+ifeq ($(FULL_TARGET),mips-linux)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -1470,6 +1671,7 @@ SHAREDLIBPREFIX=libfp
 STATICLIBPREFIX=libp
 IMPORTLIBPREFIX=libimp
 RSTEXT=.rst
+EXEDBGEXT=.dbg
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
 SHORTSUFFIX=v1
@@ -1591,6 +1793,7 @@ BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
+EXEDBGEXT=.dSYM
 endif
 ifeq ($(OS_TARGET),gba)
 EXEEXT=.gba
@@ -1842,25 +2045,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=1
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -2057,6 +2241,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2109,6 +2296,7 @@ override FPCOPT+=-P$(ARCH)
 endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
+override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
@@ -2118,6 +2306,11 @@ ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2209,7 +2402,7 @@ override FPCOPT+=-Aas
 endif
 endif
 ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifneq ($(findstring $(OS_TARGET),linux solaris),)
+ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
 ifeq ($(CPU_TARGET),x86_64)
 override FPCOPT+=-Cg
 endif
@@ -2361,9 +2554,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2497,9 +2687,11 @@ fpc_zipdistinstall:
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
+override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES))
 endif
 ifdef CLEAN_PROGRAMS
 override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS)))
+override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS)))
 endif
 ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
@@ -2516,6 +2708,9 @@ fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
 endif
+ifdef CLEANEXEDBGFILES
+	-$(DELTREE) $(CLEANEXEDBGFILES)
+endif
 ifdef CLEANPPUFILES
 	-$(DEL) $(CLEANPPUFILES)
 endif
@@ -2617,7 +2812,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
diff --git a/ideintf/Makefile.compiled b/ideintf/Makefile.compiled
index cbd8bc9707..eea85b5000 100644
--- a/ideintf/Makefile.compiled
+++ b/ideintf/Makefile.compiled
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <CONFIG>
   <Makefile Value="True"/>
-  <Params Value=" -MObjFPC -Scghi -O1 -gl -vew -l -Fu../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -dLCL -dLCL%(LCL_PLATFORM) ideintf.pas"/>
+  <Params Value=" -MObjFPC -Scghi -O1 -g -gl -vew -l -Fu../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../components/lazutils/lib/%(CPU_TARGET)-%(OS_TARGET);../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fiimages -dLCL -dLCL%(LCL_PLATFORM) ideintf.pas"/>
 </CONFIG>
diff --git a/ideintf/Makefile.fpc b/ideintf/Makefile.fpc
index 4eb2b656b8..c64203a699 100644
--- a/ideintf/Makefile.fpc
+++ b/ideintf/Makefile.fpc
@@ -2,16 +2,17 @@
 #
 #   Makefile.fpc for IDEIntf 1.0
 #
-#   This file was generated on 01/28/2011
+#   This file was generated on 14-3-12
 
 [package]
 name=ideintf
 version=1.0
 
 [compiler]
-unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
+unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
 unitdir=../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-options= -MObjFPC -Scghi -O1 -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
+includedir=images
+options= -MObjFPC -Scghi -O1 -g -gl -vew -l -dLCL -dLCL$(LCL_PLATFORM)
 
 [target]
 units=ideintf.pas