Bläddra i källkod

* Forgot to add fpjsonrtti to makefile

git-svn-id: trunk@16716 -
michael 14 år sedan
förälder
incheckning
bd7b4840b0
2 ändrade filer med 131 tillägg och 145 borttagningar
  1. 127 143
      packages/fcl-json/Makefile
  2. 4 2
      packages/fcl-json/Makefile.fpc

+ 127 - 143
packages/fcl-json/Makefile

@@ -1,8 +1,8 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/20]
 #
 #
 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
 LIMIT83fs = go32v2 os2 emx watcom
@@ -245,7 +245,7 @@ endif
 ifndef CROSSBINDIR
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifeq ($(OS_TARGET),darwin)
 ifeq ($(OS_SOURCE),darwin)
 ifeq ($(OS_SOURCE),darwin)
 DARWIN2DARWIN=1
 DARWIN2DARWIN=1
 endif
 endif
@@ -267,376 +267,370 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
 override PACKAGE_NAME=fcl-json
 override PACKAGE_NAME=fcl-json
 override PACKAGE_VERSION=2.5.1
 override PACKAGE_VERSION=2.5.1
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf
+override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 endif
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
@@ -702,9 +696,6 @@ endif
 ifeq ($(FULL_TARGET),i386-nativent)
 ifeq ($(FULL_TARGET),i386-nativent)
 override COMPILER_OPTIONS+=-S2h
 override COMPILER_OPTIONS+=-S2h
 endif
 endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_OPTIONS+=-S2h
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_OPTIONS+=-S2h
 override COMPILER_OPTIONS+=-S2h
 endif
 endif
@@ -888,9 +879,6 @@ endif
 ifeq ($(FULL_TARGET),i386-nativent)
 ifeq ($(FULL_TARGET),i386-nativent)
 override COMPILER_SOURCEDIR+=src
 override COMPILER_SOURCEDIR+=src
 endif
 endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_SOURCEDIR+=src
 override COMPILER_SOURCEDIR+=src
 endif
 endif
@@ -1338,7 +1326,7 @@ DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 IMPORTLIBPREFIX=imp
 endif
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 BATCHEXT=.sh
 EXEEXT=
 EXEEXT=
 HASSHAREDLIB=1
 HASSHAREDLIB=1
@@ -1867,11 +1855,6 @@ ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-BASE=1
 endif
 endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-BASE=1
@@ -2716,3 +2699,4 @@ endif
 .NOTPARALLEL:
 .NOTPARALLEL:
 jsonparser$(PPUEXT): jsonparser.pp fpjson$(PPUEXT) jsonscanner$(PPUEXT)
 jsonparser$(PPUEXT): jsonparser.pp fpjson$(PPUEXT) jsonscanner$(PPUEXT)
 jsonconf$(PPUEXT): jsonparser$(PPUEXT) fpjson$(PPUEXT)
 jsonconf$(PPUEXT): jsonparser$(PPUEXT) fpjson$(PPUEXT)
+fpjsonrtti$(PPUEXT): jsonparser$(PPUEXT) fpjson$(PPUEXT)

+ 4 - 2
packages/fcl-json/Makefile.fpc

@@ -7,8 +7,8 @@ name=fcl-json
 version=2.5.1
 version=2.5.1
 
 
 [target]
 [target]
-units=fpjson jsonscanner jsonparser jsonconf
-rsts=fpjson jsonscanner jsonparser jsonconf
+units=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
+rsts=fpjson jsonscanner jsonparser jsonconf fpjsonrtti
 
 
 [require]
 [require]
 packages=fcl-base
 packages=fcl-base
@@ -29,3 +29,5 @@ fpcdir=../..
 jsonparser$(PPUEXT): jsonparser.pp fpjson$(PPUEXT) jsonscanner$(PPUEXT)
 jsonparser$(PPUEXT): jsonparser.pp fpjson$(PPUEXT) jsonscanner$(PPUEXT)
 
 
 jsonconf$(PPUEXT): jsonparser$(PPUEXT) fpjson$(PPUEXT)
 jsonconf$(PPUEXT): jsonparser$(PPUEXT) fpjson$(PPUEXT)
+
+fpjsonrtti$(PPUEXT): jsonparser$(PPUEXT) fpjson$(PPUEXT)