Browse Source

rtl: enable collations building for win64

git-svn-id: trunk@23770 -
paul 12 years ago
parent
commit
d51da3ad58
2 changed files with 92 additions and 74 deletions
  1. 88 73
      rtl/win64/Makefile
  2. 4 1
      rtl/win64/Makefile.fpc

+ 88 - 73
rtl/win64/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/03/10]
 #
 #
 default: all
 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 i386-android 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
 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 i386-android 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
@@ -269,6 +269,19 @@ ifdef CROSSCOMPILE
 ifndef DARWIN2DARWIN
 ifndef DARWIN2DARWIN
 ifneq ($(CPU_TARGET),jvm)
 ifneq ($(CPU_TARGET),jvm)
 BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
 BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
+ifeq ($(OS_TARGET),android)
+ifeq ($(CPU_TARGET),arm)
+BINUTILSPREFIX=arm-linux-androideabi-
+else
+ifeq ($(CPU_TARGET),i386)
+BINUTILSPREFIX=i686-linux-android-
+else
+ifeq ($(CPU_TARGET),mips)
+BINUTILSPREFIX=mipsel-linux-android-
+endif
+endif
+endif
+endif
 endif
 endif
 endif
 endif
 endif
 endif
@@ -319,220 +332,220 @@ endif
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-android)
 ifeq ($(FULL_TARGET),i386-android)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
 ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),arm-android)
 ifeq ($(FULL_TARGET),arm-android)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),mips-linux)
 ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),jvm-java)
 ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),jvm-android)
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 endif
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_IMPLICITUNITS+=ctypes strings heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset character ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo fpintres windirs cpu signals
 override TARGET_IMPLICITUNITS+=ctypes strings heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset character ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo fpintres windirs cpu signals
@@ -2795,6 +2808,8 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) buildrtl$(PPUEXT)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
 buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT)
 buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT)
 	$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(WINDIR) -I$(OBJPASDIR) -I$(WININC) -Fu$(WININC) -Fu$(WINDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
 	$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(WINDIR) -I$(OBJPASDIR) -I$(WININC) -Fu$(WININC) -Fu$(WINDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
+buildcollations$(PPUEXT): $(OBJPASDIR)/collations/buildcollations.pas system$(PPUEXT) objpas$(PPUEXT)
+	$(COMPILER) -Fu$(OBJPASDIR) -Fi$(OBJPASDIR)/collations -I$(OBJPASDIR)/collations $(OBJPASDIR)/collations/buildcollations.pas
 iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
 iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(INC)/iso7185.pp
 	$(COMPILER) $(INC)/iso7185.pp
 lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT)
 lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT)

+ 4 - 1
rtl/win64/Makefile.fpc

@@ -7,7 +7,7 @@ main=rtl
 
 
 [target]
 [target]
 loaders=$(LOADERS)
 loaders=$(LOADERS)
-units=system uuchar objpas macpas iso7185 buildrtl lineinfo lnfodwrf
+units=system uuchar objpas macpas iso7185 buildrtl buildcollations lineinfo lnfodwrf
 implicitunits=ctypes strings \
 implicitunits=ctypes strings \
       heaptrc matrix \
       heaptrc matrix \
       dos crt objects messages \
       dos crt objects messages \
@@ -109,6 +109,9 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) buildrtl$(PPUEXT)
 buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT)
 buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(WINDIR) -I$(OBJPASDIR) -I$(WININC) -Fu$(WININC) -Fu$(WINDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(WINDIR) -I$(OBJPASDIR) -I$(WININC) -Fu$(WININC) -Fu$(WINDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
 
 
+buildcollations$(PPUEXT): $(OBJPASDIR)/collations/buildcollations.pas system$(PPUEXT) objpas$(PPUEXT)
+        $(COMPILER) -Fu$(OBJPASDIR) -Fi$(OBJPASDIR)/collations -I$(OBJPASDIR)/collations $(OBJPASDIR)/collations/buildcollations.pas
+
 iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
 iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
         $(COMPILER) $(INC)/iso7185.pp
         $(COMPILER) $(INC)/iso7185.pp