From bc9ce007d004b9c3f714d968c22329a45dc30994 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 12 Mar 2011 20:00:47 +0000 Subject: [PATCH] * regenerated using current fpcmake git-svn-id: trunk@17121 - --- packages/fcl-json/Makefile | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/fcl-json/Makefile b/packages/fcl-json/Makefile index dcf4e98380..4ad9d8c0fc 100644 --- a/packages/fcl-json/Makefile +++ b/packages/fcl-json/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/20] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/10/20] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -329,6 +329,9 @@ endif ifeq ($(FULL_TARGET),i386-nativent) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif @@ -512,6 +515,9 @@ endif ifeq ($(FULL_TARGET),i386-nativent) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif @@ -696,6 +702,9 @@ endif ifeq ($(FULL_TARGET),i386-nativent) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-S2h endif @@ -879,6 +888,9 @@ endif ifeq ($(FULL_TARGET),i386-nativent) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_SOURCEDIR+=src endif @@ -1326,7 +1338,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -1855,6 +1867,11 @@ ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 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) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1