fixed a few layouts

git-svn-id: trunk@8606 -
2025-11-04 10:39:53 +01:00 · 2006-01-23 18:25:13 +00:00 · 2006-01-23 18:25:13 +00:00 · f78320e79d
commit f78320e79d
parent b9df1396b6
6 changed files with 189 additions and 303 deletions
--- a/131
+++ b/131
@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/01/19]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/26]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@ -867,9 +867,6 @@ endif
 ifndef INSTALL_DATADIR
 INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
-ifndef INSTALL_SHAREDDIR
-INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib
-endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))
@ -916,7 +913,6 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.so
-SHAREDLIBPREFIX=libfp
 STATICLIBPREFIX=libp
 RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
@ -1445,7 +1441,6 @@ endif
 override REQUIRE_PACKAGES=rtl fcl regexpr
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1461,7 +1456,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1471,7 +1465,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
@ -1486,7 +1479,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
@ -1496,7 +1488,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1512,7 +1503,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1522,7 +1512,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1537,7 +1526,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1547,7 +1535,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1557,7 +1544,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1567,7 +1553,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1582,7 +1567,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1592,7 +1576,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
@ -1602,7 +1585,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1612,7 +1594,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1622,20 +1603,15 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
 REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_POSTGRES=1
-REQUIRE_PACKAGES_SQLITE=1
+REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1651,7 +1627,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1667,7 +1642,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1682,7 +1656,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1692,7 +1665,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1702,7 +1674,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1717,7 +1688,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1727,7 +1697,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1743,7 +1712,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1758,7 +1726,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1768,7 +1735,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1784,7 +1750,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1794,7 +1759,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1810,7 +1774,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1825,7 +1788,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1835,7 +1797,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1851,7 +1812,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1867,7 +1827,6 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
@ -1877,7 +1836,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1893,20 +1851,15 @@ REQUIRE_PACKAGES_SQLITE=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
 REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_POSTGRES=1
-REQUIRE_PACKAGES_SQLITE=1
+REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
@ -1946,32 +1899,6 @@ ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_HASH
-PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_HASH),)
-ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
-UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
-else
-UNITDIR_HASH=$(PACKAGEDIR_HASH)
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_HASH)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_HASH=
-UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_HASH),)
-UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
-else
-UNITDIR_HASH=
-endif
-endif
-ifdef UNITDIR_HASH
-override COMPILER_UNITDIR+=$(UNITDIR_HASH)
-endif
-endif
 ifdef REQUIRE_PACKAGES_PASZLIB
 PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_PASZLIB),)
@ -2391,14 +2318,6 @@ ifeq ($(FPC_VERSION),1.0.6)
 override FPCOPTDEF+=HASUNIX
 endif
 endif
-ifdef CREATESHARED
-override FPCOPT+=-Cg
-ifeq ($(CPU_TARGET),i386)
-override FPCOPT+=-Aas
-endif
-endif
-ifdef LINKSHARED
-endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
 endif
@ -2419,14 +2338,6 @@ override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
 endif
-override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
-override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
-ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
-override ACROSSCOMPILE=1
-endif
-ifdef ACROSSCOMPILE
-override FPCOPT+=$(CROSSOPT)
-endif
 override COMPILER:=$(FPC) $(FPCOPT)
 ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=
@ -2474,7 +2385,7 @@ ifneq ($(TARGET_EXAMPLEDIRS),)
 HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
+.PHONY: fpc_all fpc_smart fpc_debug fpc_release
 $(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
@ -2515,38 +2426,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@ -3598,7 +3477,7 @@ debug: fpc_debug
 smart: fpc_smart
 release: fpc_release
 units: fpc_units $(addsuffix _units,$(TARGET_DIRS))
-shared: fpc_shared
+shared: $(addsuffix _shared,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
 distinstall: fpc_distinstall
--- a/ide/addtoprojectdlg.lfm
+++ b/ide/addtoprojectdlg.lfm
@ -1,52 +1,56 @@
 object AddToProjectDialog: TAddToProjectDialog
+  Left = 324
+  Height = 300
+  Top = 251
+  Width = 500
+  HorzScrollBar.Page = 499
+  VertScrollBar.Page = 299
  ActiveControl = FilesListView
  BorderStyle = bsSizeToolWin
  Caption = 'AddToProjectDialog'
  ClientHeight = 300
  ClientWidth = 500
  OnClose = AddToProjectDialogClose
-  PixelsPerInch = 96
+  PixelsPerInch = 95
  Position = poScreenCenter
-  HorzScrollBar.Page = 499
-  VertScrollBar.Page = 299
-  Left = 314
-  Height = 300
-  Top = 610
-  Width = 500
  object Notebook: TNotebook
-    Align = alClient
-    PageIndex = 2
    Height = 300
    Width = 500
+    Align = alClient
+    PageIndex = 2
    object AddEditorFilePage: TPage
      Caption = 'AddEditorFilePage'
-      ClientWidth = 492
-      ClientHeight = 274
-      Height = 274
-      Width = 492
+      ClientWidth = 496
+      ClientHeight = 270
      object AddFileLabel: TLabel
+        Left = 6
+        Height = 13
+        Top = 6
+        Width = 484
        Align = alTop
        BorderSpacing.Around = 6
        Caption = 'AddFileLabel'
        Color = clNone
        ParentColor = False
-        Left = 6
-        Height = 14
-        Top = 6
-        Width = 480
      end
      object AddFileListBox: TListBox
+        Left = 6
+        Height = 202
+        Top = 25
+        Width = 484
        Align = alTop
        Anchors = [akTop, akLeft, akRight, akBottom]
        BorderSpacing.Around = 6
        MultiSelect = True
        TabOrder = 0
-        Left = 6
-        Height = 205
-        Top = 26
-        Width = 480
+        TopIndex = -1
      end
      object AddFileButton: TButton
+        AnchorSideRight.Control = CancelAddFileButton
+        Left = 263
+        Height = 26
+        Top = 237
+        Width = 89
        Anchors = [akRight, akBottom]
        AutoSize = True
        BorderSpacing.Right = 6
@ -54,71 +58,69 @@ object AddToProjectDialog: TAddToProjectDialog
        Caption = 'AddFileButton'
        OnClick = AddFileButtonClick
        TabOrder = 1
-        AnchorSideRight.Control = CancelAddFileButton
-        Left = 264
-        Height = 29
-        Top = 238
-        Width = 90
      end
      object CancelAddFileButton: TButton
+        Left = 358
+        Height = 26
+        Top = 237
+        Width = 129
        Anchors = [akRight, akBottom]
        AutoSize = True
        BorderSpacing.InnerBorder = 2
        Caption = 'CancelAddFileButton'
        ModalResult = 2
        TabOrder = 2
-        Left = 360
-        Height = 29
-        Top = 238
-        Width = 123
      end
    end
    object NewDependPage: TPage
      Caption = 'NewDependPage'
-      ClientWidth = 492
-      ClientHeight = 274
-      Height = 274
-      Width = 492
+      ClientWidth = 496
+      ClientHeight = 270
      object DependPkgNameLabel: TLabel
+        Left = 8
+        Height = 13
+        Top = 19
+        Width = 129
        Caption = 'DependPkgNameLabel'
        Color = clNone
        ParentColor = False
-        Left = 8
-        Height = 14
-        Top = 19
-        Width = 107
      end
      object DependMinVersionLabel: TLabel
+        Left = 8
+        Height = 13
+        Top = 47
+        Width = 140
        Caption = 'DependMinVersionLabel'
        Color = clNone
        ParentColor = False
-        Left = 8
-        Height = 14
-        Top = 47
-        Width = 114
      end
      object DependMaxVersionLabel: TLabel
+        Left = 8
+        Height = 13
+        Top = 76
+        Width = 143
        Caption = 'DependMaxVersionLabel'
        Color = clNone
        ParentColor = False
-        Left = 8
-        Height = 14
-        Top = 76
-        Width = 118
      end
      object CancelDependButton: TButton
+        Left = 361
+        Height = 26
+        Top = 241
+        Width = 129
        Anchors = [akRight, akBottom]
        AutoSize = True
        BorderSpacing.InnerBorder = 2
        Caption = 'CancelDependButton'
        ModalResult = 2
        TabOrder = 0
-        Left = 360
-        Height = 29
-        Top = 242
-        Width = 126
      end
      object NewDependButton: TButton
+        AnchorSideRight.Control = CancelDependButton
+        Left = 241
+        Height = 26
+        Top = 241
+        Width = 114
        Anchors = [akRight, akBottom]
        AutoSize = True
        BorderSpacing.Right = 6
@ -126,72 +128,73 @@ object AddToProjectDialog: TAddToProjectDialog
        Caption = 'NewDependButton'
        OnClick = NewDependButtonClick
        TabOrder = 1
-        AnchorSideRight.Control = CancelDependButton
-        Left = 239
-        Height = 29
-        Top = 242
-        Width = 115
      end
      object DependPkgNameComboBox: TComboBox
-        Anchors = [akTop, akLeft, akRight]
-        MaxLength = 0
-        TabOrder = 2
-        Text = 'DependPkgNameComboBox'
        Left = 218
        Height = 21
        Top = 16
-        Width = 268
+        Width = 272
+        Anchors = [akTop, akLeft, akRight]
+        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+        MaxLength = 0
+        TabOrder = 2
+        Text = 'DependPkgNameComboBox'
      end
      object DependMinVersionEdit: TEdit
-        Anchors = [akTop, akLeft, akRight]
-        TabOrder = 3
-        Text = 'DependMinVersionEdit'
        Left = 218
        Height = 23
        Top = 42
-        Width = 268
+        Width = 272
+        Anchors = [akTop, akLeft, akRight]
+        TabOrder = 3
+        Text = 'DependMinVersionEdit'
      end
      object DependMaxVersionEdit: TEdit
-        Anchors = [akTop, akLeft, akRight]
-        TabOrder = 4
-        Text = 'DependMaxVersionEdit'
        Left = 218
        Height = 23
        Top = 71
-        Width = 268
+        Width = 272
+        Anchors = [akTop, akLeft, akRight]
+        TabOrder = 4
+        Text = 'DependMaxVersionEdit'
      end
    end
    object AddFilesPage: TPage
      Caption = 'AddFilesPage'
-      ClientWidth = 492
-      ClientHeight = 274
-      Height = 274
-      Width = 492
+      ClientWidth = 496
+      ClientHeight = 270
      object FilesListView: TListView
+        Left = 6
+        Height = 221
+        Top = 6
+        Width = 484
        Align = alTop
        Anchors = [akTop, akLeft, akRight, akBottom]
        BorderSpacing.Around = 6
        Columns = <>
        MultiSelect = True
+        TabOrder = 0
        ViewStyle = vsReport
-        Left = 6
-        Height = 225
-        Top = 6
-        Width = 480
      end
      object FilesBrowseButton: TButton
+        Left = 6
+        Height = 26
+        Top = 236
+        Width = 113
        Anchors = [akLeft, akBottom]
        AutoSize = True
        BorderSpacing.InnerBorder = 2
        Caption = 'FilesBrowseButton'
        OnClick = FilesBrowseButtonClick
        TabOrder = 1
-        Left = 6
-        Height = 29
-        Top = 237
-        Width = 111
      end
      object FilesShortenButton: TButton
+        AnchorSideLeft.Control = FilesBrowseButton
+        AnchorSideLeft.Side = asrBottom
+        Left = 125
+        Height = 26
+        Top = 236
+        Width = 115
        Anchors = [akLeft, akBottom]
        AutoSize = True
        BorderSpacing.Left = 6
@ -199,13 +202,14 @@ object AddToProjectDialog: TAddToProjectDialog
        Caption = 'FilesShortenButton'
        OnClick = FilesShortenButtonClick
        TabOrder = 2
-        AnchorSideLeft.Control = FilesBrowseButton
-        Left = 123
-        Height = 29
-        Top = 237
-        Width = 113
      end
      object FilesDeleteButton: TButton
+        AnchorSideLeft.Control = FilesShortenButton
+        AnchorSideLeft.Side = asrBottom
+        Left = 246
+        Height = 26
+        Top = 236
+        Width = 108
        Anchors = [akLeft, akBottom]
        AutoSize = True
        BorderSpacing.Left = 6
@ -213,13 +217,14 @@ object AddToProjectDialog: TAddToProjectDialog
        Caption = 'FilesDeleteButton'
        OnClick = FilesDeleteButtonClick
        TabOrder = 3
-        AnchorSideLeft.Control = FilesShortenButton
-        Left = 242
-        Height = 29
-        Top = 237
-        Width = 107
      end
      object FilesAddButton: TButton
+        AnchorSideLeft.Control = FilesDeleteButton
+        AnchorSideLeft.Side = asrBottom
+        Left = 360
+        Height = 26
+        Top = 236
+        Width = 95
        Anchors = [akLeft, akBottom]
        AutoSize = True
        BorderSpacing.Left = 6
@ -227,11 +232,6 @@ object AddToProjectDialog: TAddToProjectDialog
        Caption = 'FilesAddButton'
        OnClick = FilesAddButtonClick
        TabOrder = 4
-        AnchorSideLeft.Control = FilesDeleteButton
-        Left = 355
-        Height = 29
-        Top = 237
-        Width = 95
      end
    end
  end
--- a/ide/addtoprojectdlg.lrs
+++ b/ide/addtoprojectdlg.lrs
@ -1,73 +1,77 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TAddToProjectDialog','FORMDATA',[
-  'TPF0'#19'TAddToProjectDialog'#18'AddToProjectDialog'#13'ActiveControl'#7#13
-  +'FilesListView'#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#18'AddToPro'
-  +'jectDialog'#12'ClientHeight'#3','#1#11'ClientWidth'#3#244#1#7'OnClose'#7#23
-  +'AddToProjectDialogClose'#13'PixelsPerInch'#2'`'#8'Position'#7#14'poScreenCe'
-  +'nter'#18'HorzScrollBar.Page'#3#243#1#18'VertScrollBar.Page'#3'+'#1#4'Left'#3
-  +':'#1#6'Height'#3','#1#3'Top'#3'b'#2#5'Width'#3#244#1#0#9'TNotebook'#8'Noteb'
-  +'ook'#5'Align'#7#8'alClient'#9'PageIndex'#2#2#6'Height'#3','#1#5'Width'#3#244
-  +#1#0#5'TPage'#17'AddEditorFilePage'#7'Caption'#6#17'AddEditorFilePage'#11'Cl'
-  +'ientWidth'#3#236#1#12'ClientHeight'#3#18#1#6'Height'#3#18#1#5'Width'#3#236#1
-  +#0#6'TLabel'#12'AddFileLabel'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2
-  +#6#7'Caption'#6#12'AddFileLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Le'
-  +'ft'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#224#1#0#0#8'TListBox'#14'AddFi'
-  +'leListBox'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
-  +'akBottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#0#4
-  +'Left'#2#6#6'Height'#3#205#0#3'Top'#2#26#5'Width'#3#224#1#0#0#7'TButton'#13
-  +'AddFileButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'Bord'
-  +'erSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#13'AddF'
-  +'ileButton'#7'OnClick'#7#18'AddFileButtonClick'#8'TabOrder'#2#1#23'AnchorSid'
-  +'eRight.Control'#7#19'CancelAddFileButton'#4'Left'#3#8#1#6'Height'#2#29#3'To'
-  +'p'#3#238#0#5'Width'#2'Z'#0#0#7'TButton'#19'CancelAddFileButton'#7'Anchors'
-  +#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25'BorderSpacing.InnerBorder'#2#2
-  +#7'Caption'#6#19'CancelAddFileButton'#11'ModalResult'#2#2#8'TabOrder'#2#2#4
-  +'Left'#3'h'#1#6'Height'#2#29#3'Top'#3#238#0#5'Width'#2'{'#0#0#0#5'TPage'#13
-  +'NewDependPage'#7'Caption'#6#13'NewDependPage'#11'ClientWidth'#3#236#1#12'Cl'
-  +'ientHeight'#3#18#1#6'Height'#3#18#1#5'Width'#3#236#1#0#6'TLabel'#18'DependP'
-  +'kgNameLabel'#7'Caption'#6#18'DependPkgNameLabel'#5'Color'#7#6'clNone'#11'Pa'
-  +'rentColor'#8#4'Left'#2#8#6'Height'#2#14#3'Top'#2#19#5'Width'#2'k'#0#0#6'TLa'
-  +'bel'#21'DependMinVersionLabel'#7'Caption'#6#21'DependMinVersionLabel'#5'Col'
-  +'or'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#8#6'Height'#2#14#3'Top'#2'/'#5
-  +'Width'#2'r'#0#0#6'TLabel'#21'DependMaxVersionLabel'#7'Caption'#6#21'DependM'
-  +'axVersionLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#8#6'Height'
-  +#2#14#3'Top'#2'L'#5'Width'#2'v'#0#0#7'TButton'#18'CancelDependButton'#7'Anch'
-  +'ors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25'BorderSpacing.InnerBorder'
-  +#2#2#7'Caption'#6#18'CancelDependButton'#11'ModalResult'#2#2#8'TabOrder'#2#0
-  +#4'Left'#3'h'#1#6'Height'#2#29#3'Top'#3#242#0#5'Width'#2'~'#0#0#7'TButton'#15
-  +'NewDependButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'Bo'
-  +'rderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#15'Ne'
-  +'wDependButton'#7'OnClick'#7#20'NewDependButtonClick'#8'TabOrder'#2#1#23'Anc'
-  +'horSideRight.Control'#7#18'CancelDependButton'#4'Left'#3#239#0#6'Height'#2
-  +#29#3'Top'#3#242#0#5'Width'#2's'#0#0#9'TComboBox'#21'DependPkgNameComboBox'#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#9'MaxLength'#2#0#8'TabOrder'#2#2
-  +#4'Text'#6#21'DependPkgNameComboBox'#4'Left'#3#218#0#6'Height'#2#21#3'Top'#2
-  +#16#5'Width'#3#12#1#0#0#5'TEdit'#20'DependMinVersionEdit'#7'Anchors'#11#5'ak'
-  +'Top'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#3#4'Text'#6#20'DependMinVersionEd'
-  +'it'#4'Left'#3#218#0#6'Height'#2#23#3'Top'#2'*'#5'Width'#3#12#1#0#0#5'TEdit'
-  +#20'DependMaxVersionEdit'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'Ta'
-  +'bOrder'#2#4#4'Text'#6#20'DependMaxVersionEdit'#4'Left'#3#218#0#6'Height'#2
-  +#23#3'Top'#2'G'#5'Width'#3#12#1#0#0#0#5'TPage'#12'AddFilesPage'#7'Caption'#6
-  +#12'AddFilesPage'#11'ClientWidth'#3#236#1#12'ClientHeight'#3#18#1#6'Height'#3
-  +#18#1#5'Width'#3#236#1#0#9'TListView'#13'FilesListView'#5'Align'#7#5'alTop'#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Ar'
-  +'ound'#2#6#7'Columns'#14#0#11'MultiSelect'#9#9'ViewStyle'#7#8'vsReport'#4'Le'
-  +'ft'#2#6#6'Height'#3#225#0#3'Top'#2#6#5'Width'#3#224#1#0#0#7'TButton'#17'Fil'
-  +'esBrowseButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#25'Bord'
-  +'erSpacing.InnerBorder'#2#2#7'Caption'#6#17'FilesBrowseButton'#7'OnClick'#7
-  +#22'FilesBrowseButtonClick'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2#29#3'Top'
-  +#3#237#0#5'Width'#2'o'#0#0#7'TButton'#18'FilesShortenButton'#7'Anchors'#11#6
-  +'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#25'BorderSpa'
-  +'cing.InnerBorder'#2#2#7'Caption'#6#18'FilesShortenButton'#7'OnClick'#7#23'F'
-  +'ilesShortenButtonClick'#8'TabOrder'#2#2#22'AnchorSideLeft.Control'#7#17'Fil'
-  +'esBrowseButton'#4'Left'#2'{'#6'Height'#2#29#3'Top'#3#237#0#5'Width'#2'q'#0#0
-  +#7'TButton'#17'FilesDeleteButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'Au'
-  +'toSize'#9#18'BorderSpacing.Left'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Ca'
-  +'ption'#6#17'FilesDeleteButton'#7'OnClick'#7#22'FilesDeleteButtonClick'#8'Ta'
-  ,'bOrder'#2#3#22'AnchorSideLeft.Control'#7#18'FilesShortenButton'#4'Left'#3
-  +#242#0#6'Height'#2#29#3'Top'#3#237#0#5'Width'#2'k'#0#0#7'TButton'#14'FilesAd'
-  +'dButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpaci'
-  +'ng.Left'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#14'FilesAddButt'
-  +'on'#7'OnClick'#7#19'FilesAddButtonClick'#8'TabOrder'#2#4#22'AnchorSideLeft.'
-  +'Control'#7#17'FilesDeleteButton'#4'Left'#3'c'#1#6'Height'#2#29#3'Top'#3#237
-  +#0#5'Width'#2'_'#0#0#0#0#0
+  'TPF0'#19'TAddToProjectDialog'#18'AddToProjectDialog'#4'Left'#3'D'#1#6'Height'
+  +#3','#1#3'Top'#3#251#0#5'Width'#3#244#1#18'HorzScrollBar.Page'#3#243#1#18'Ve'
+  +'rtScrollBar.Page'#3'+'#1#13'ActiveControl'#7#13'FilesListView'#11'BorderSty'
+  +'le'#7#13'bsSizeToolWin'#7'Caption'#6#18'AddToProjectDialog'#12'ClientHeight'
+  +#3','#1#11'ClientWidth'#3#244#1#7'OnClose'#7#23'AddToProjectDialogClose'#13
+  +'PixelsPerInch'#2'_'#8'Position'#7#14'poScreenCenter'#0#9'TNotebook'#8'Noteb'
+  +'ook'#6'Height'#3','#1#5'Width'#3#244#1#5'Align'#7#8'alClient'#9'PageIndex'#2
+  +#2#0#5'TPage'#17'AddEditorFilePage'#7'Caption'#6#17'AddEditorFilePage'#11'Cl'
+  +'ientWidth'#3#240#1#12'ClientHeight'#3#14#1#0#6'TLabel'#12'AddFileLabel'#4'L'
+  +'eft'#2#6#6'Height'#2#13#3'Top'#2#6#5'Width'#3#228#1#5'Align'#7#5'alTop'#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#12'AddFileLabel'#5'Color'#7#6'clNone'
+  +#11'ParentColor'#8#0#0#8'TListBox'#14'AddFileListBox'#4'Left'#2#6#6'Height'#3
+  +#202#0#3'Top'#2#25#5'Width'#3#228#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTo'
+  +'p'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#11'Multi'
+  +'Select'#9#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#7'TButton'#13'AddFileButton'
+  +#23'AnchorSideRight.Control'#7#19'CancelAddFileButton'#4'Left'#3#7#1#6'Heigh'
+  +'t'#2#26#3'Top'#3#237#0#5'Width'#2'Y'#7'Anchors'#11#7'akRight'#8'akBottom'#0
+  +#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2
+  +#7'Caption'#6#13'AddFileButton'#7'OnClick'#7#18'AddFileButtonClick'#8'TabOrd'
+  +'er'#2#1#0#0#7'TButton'#19'CancelAddFileButton'#4'Left'#3'f'#1#6'Height'#2#26
+  +#3'Top'#3#237#0#5'Width'#3#129#0#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Au'
+  +'toSize'#9#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#19'CancelAddFileBu'
+  +'tton'#11'ModalResult'#2#2#8'TabOrder'#2#2#0#0#0#5'TPage'#13'NewDependPage'#7
+  +'Caption'#6#13'NewDependPage'#11'ClientWidth'#3#240#1#12'ClientHeight'#3#14#1
+  +#0#6'TLabel'#18'DependPkgNameLabel'#4'Left'#2#8#6'Height'#2#13#3'Top'#2#19#5
+  +'Width'#3#129#0#7'Caption'#6#18'DependPkgNameLabel'#5'Color'#7#6'clNone'#11
+  +'ParentColor'#8#0#0#6'TLabel'#21'DependMinVersionLabel'#4'Left'#2#8#6'Height'
+  +#2#13#3'Top'#2'/'#5'Width'#3#140#0#7'Caption'#6#21'DependMinVersionLabel'#5
+  +'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#21'DependMaxVersionLabel'
+  +#4'Left'#2#8#6'Height'#2#13#3'Top'#2'L'#5'Width'#3#143#0#7'Caption'#6#21'Dep'
+  +'endMaxVersionLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7'TButton'#18
+  +'CancelDependButton'#4'Left'#3'i'#1#6'Height'#2#26#3'Top'#3#241#0#5'Width'#3
+  +#129#0#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25'BorderSpacing'
+  +'.InnerBorder'#2#2#7'Caption'#6#18'CancelDependButton'#11'ModalResult'#2#2#8
+  +'TabOrder'#2#0#0#0#7'TButton'#15'NewDependButton'#23'AnchorSideRight.Control'
+  +#7#18'CancelDependButton'#4'Left'#3#241#0#6'Height'#2#26#3'Top'#3#241#0#5'Wi'
+  +'dth'#2'r'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpa'
+  +'cing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#15'NewDepend'
+  +'Button'#7'OnClick'#7#20'NewDependButtonClick'#8'TabOrder'#2#1#0#0#9'TComboB'
+  +'ox'#21'DependPkgNameComboBox'#4'Left'#3#218#0#6'Height'#2#21#3'Top'#2#16#5
+  +'Width'#3#16#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoComplete'
+  +'Text'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'
+  +#2#0#8'TabOrder'#2#2#4'Text'#6#21'DependPkgNameComboBox'#0#0#5'TEdit'#20'Dep'
+  +'endMinVersionEdit'#4'Left'#3#218#0#6'Height'#2#23#3'Top'#2'*'#5'Width'#3#16
+  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#3#4'Text'#6#20
+  +'DependMinVersionEdit'#0#0#5'TEdit'#20'DependMaxVersionEdit'#4'Left'#3#218#0
+  +#6'Height'#2#23#3'Top'#2'G'#5'Width'#3#16#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#8'TabOrder'#2#4#4'Text'#6#20'DependMaxVersionEdit'#0#0#0#5'TPa'
+  +'ge'#12'AddFilesPage'#7'Caption'#6#12'AddFilesPage'#11'ClientWidth'#3#240#1
+  +#12'ClientHeight'#3#14#1#0#9'TListView'#13'FilesListView'#4'Left'#2#6#6'Heig'
+  +'ht'#3#221#0#3'Top'#2#6#5'Width'#3#228#1#5'Align'#7#5'alTop'#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Co'
+  +'lumns'#14#0#11'MultiSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0#0
+  +#7'TButton'#17'FilesBrowseButton'#4'Left'#2#6#6'Height'#2#26#3'Top'#3#236#0#5
+  +'Width'#2'q'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#25'BorderSp'
+  +'acing.InnerBorder'#2#2#7'Caption'#6#17'FilesBrowseButton'#7'OnClick'#7#22'F'
+  +'ilesBrowseButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#18'FilesShortenButton'
+  +#22'AnchorSideLeft.Control'#7#17'FilesBrowseButton'#19'AnchorSideLeft.Side'#7
+  +#9'asrBottom'#4'Left'#2'}'#6'Height'#2#26#3'Top'#3#236#0#5'Width'#2's'#7'Anc'
+  +'hors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#25
+  +'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#18'FilesShortenButton'#7'OnClic'
+  +'k'#7#23'FilesShortenButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#17'FilesDel'
+  +'eteButton'#22'AnchorSideLeft.Control'#7#18'FilesShortenButton'#19'AnchorSid'
+  +'eLeft.Side'#7#9'asrBottom'#4'Left'#3#246#0#6'Height'#2#26#3'Top'#3#236#0#5
+  ,'Width'#2'l'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSp'
+  +'acing.Left'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#17'FilesDele'
+  +'teButton'#7'OnClick'#7#22'FilesDeleteButtonClick'#8'TabOrder'#2#3#0#0#7'TBu'
+  +'tton'#14'FilesAddButton'#22'AnchorSideLeft.Control'#7#17'FilesDeleteButton'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3'h'#1#6'Height'#2#26#3'Top'
+  +#3#236#0#5'Width'#2'_'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18
+  +'BorderSpacing.Left'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#14'F'
+  +'ilesAddButton'#7'OnClick'#7#19'FilesAddButtonClick'#8'TabOrder'#2#4#0#0#0#0
+  +#0
 ]);
--- a/ide/viewunit_dlg.lfm
+++ b/ide/viewunit_dlg.lfm
@ -3,7 +3,7 @@ object ViewUnitDialog: TViewUnitDialog
  Caption = 'View Project Units'
  ClientHeight = 213
  ClientWidth = 416
-  PixelsPerInch = 96
+  PixelsPerInch = 95
  Position = poScreenCenter
  HorzScrollBar.Page = 415
  VertScrollBar.Page = 212
@ -48,6 +48,7 @@ object ViewUnitDialog: TViewUnitDialog
    OnDblClick = BTNOKCLICK
    OnKeyDown = ListboxKeyDown
    TabOrder = 0
+    TopIndex = -1
    Left = 10
    Height = 156
    Top = 45
@ -59,8 +60,8 @@ object ViewUnitDialog: TViewUnitDialog
    OnClick = MultiselectCheckBoxClick
    TabOrder = 4
    Left = 312
-    Height = 13
+    Height = 24
    Top = 100
-    Width = 75
+    Width = 93
  end
 end
--- a/ide/viewunit_dlg.lrs
+++ b/ide/viewunit_dlg.lrs
@ -3,7 +3,7 @@
 LazarusResources.Add('TViewUnitDialog','FORMDATA',[
  'TPF0'#15'TViewUnitDialog'#14'ViewUnitDialog'#13'ActiveControl'#7#7'Listbox'#7
  +'Caption'#6#18'View Project Units'#12'ClientHeight'#3#213#0#11'ClientWidth'#3
-  +#160#1#13'PixelsPerInch'#2'`'#8'Position'#7#14'poScreenCenter'#18'HorzScroll'
+  +#160#1#13'PixelsPerInch'#2'_'#8'Position'#7#14'poScreenCenter'#18'HorzScroll'
  +'Bar.Page'#3#159#1#18'VertScrollBar.Page'#3#212#0#4'Left'#3'Q'#1#6'Height'#3
  +#213#0#3'Top'#3''''#1#5'Width'#3#160#1#0#7'TButton'#5'btnOK'#7'Anchors'#11#5
  +'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#2'OK'#7
@ -15,9 +15,9 @@ LazarusResources.Add('TViewUnitDialog','FORMDATA',[
  +#7'akRight'#0#7'Enabled'#8#8'TabOrder'#2#3#4'Left'#2#10#6'Height'#2#25#3'Top'
  +#2#10#5'Width'#3'&'#1#0#0#8'TListBox'#7'Listbox'#7'Anchors'#11#5'akTop'#6'ak'
  +'Left'#7'akRight'#8'akBottom'#0#16'ClickOnSelChange'#8#10'OnDblClick'#7#10'B'
-  +'TNOKCLICK'#9'OnKeyDown'#7#14'ListboxKeyDown'#8'TabOrder'#2#0#4'Left'#2#10#6
-  +'Height'#3#156#0#3'Top'#2'-'#5'Width'#3'&'#1#0#0#9'TCheckBox'#19'MultiSelect'
-  +'CheckBox'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#12'Multi Select'
-  +#7'OnClick'#7#24'MultiselectCheckBoxClick'#8'TabOrder'#2#4#4'Left'#3'8'#1#6
-  +'Height'#2#13#3'Top'#2'd'#5'Width'#2'K'#0#0#0
+  +'TNOKCLICK'#9'OnKeyDown'#7#14'ListboxKeyDown'#8'TabOrder'#2#0#8'TopIndex'#2
+  +#255#4'Left'#2#10#6'Height'#3#156#0#3'Top'#2'-'#5'Width'#3'&'#1#0#0#9'TCheck'
+  +'Box'#19'MultiSelectCheckBox'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'
+  +#6#12'Multi Select'#7'OnClick'#7#24'MultiselectCheckBoxClick'#8'TabOrder'#2#4
+  +#4'Left'#3'8'#1#6'Height'#2#24#3'Top'#2'd'#5'Width'#2']'#0#0#0
 ]);
--- a/lcl/lresources.pp
+++ b/lcl/lresources.pp
@ -31,6 +31,8 @@ unit LResources;

 {$mode objfpc}{$H+}

+{ $DEFINE WideStringLenDoubled}
+
 interface

 uses
@ -1759,7 +1761,7 @@ var
  var
    i: Integer;
  begin
-    SetLength(Result,Length(s) div SizeOf(WideChar));
+    SetLength(Result,Length(s){$IFDEF WideStringLenDoubled} div 2{$ENDIF});
    for i:=1 to length(Result) do
      Result[i]:=chr(ord(s[i]));
  end;
@ -1768,7 +1770,7 @@ var
  var
    i: Integer;
  begin
-    SetLength(Result,Length(s) div SizeOf(WideChar));
+    SetLength(Result,Length(s){$IFDEF WideStringLenDoubled} div 2{$ENDIF});
    for i:=1 to length(Result) do
      Result[i]:=chr(ord(s[i]));
  end;