From 1afbfb7777fec3a15b9dfb3b5a696502a9a67920 Mon Sep 17 00:00:00 2001 From: jonas Date: Wed, 29 Sep 2010 21:56:47 +0000 Subject: + i386/iphonesim target for the new iPhoneSimulator in Xcode 3.2.4 and later: the same as i386/darwin, except a) uses the non-fragile Objective-C ABI/runtime b) does not require stubs for direct calls/jumps (not required for i386/darwin under 10.6 and later either, but still generated there for backwards compatibility) c) only the same packages are enabled as for ARM/Darwin d) MacOSAll is compiled specifically for the iPhoneSimulator SDK This target also defines the symbol "darwin" apart from the target name "iphonesim" for source code compatibility reasons. git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@16065 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/numlib/Makefile | 44 +++++++++++++-- packages/numlib/examples/Makefile | 112 +++++++++++++++++++++++++++++++++++--- 2 files changed, 142 insertions(+), 14 deletions(-) (limited to 'packages/numlib') diff --git a/packages/numlib/Makefile b/packages/numlib/Makefile index 777483a1d2..e2f06d3b62 100644 --- a/packages/numlib/Makefile +++ b/packages/numlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/12/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] # 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 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 @@ -326,6 +326,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif @@ -507,6 +513,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_INCLUDEDIR+=src endif @@ -687,6 +699,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1134,7 +1152,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -1149,6 +1167,10 @@ ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1634,6 +1656,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2135,7 +2163,7 @@ ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) ifdef USETAR ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) -ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) * +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * else ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * @@ -2180,6 +2208,9 @@ fpc_zipdistinstall: ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) endif +ifdef CLEAN_PROGRAMS +override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +endif ifdef CLEAN_UNITS override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) endif @@ -2226,6 +2257,9 @@ endif ifdef CLEANRSTFILES -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES)) endif +endif +ifdef CLEAN_FILES + -$(DEL) $(CLEAN_FILES) endif -$(DELTREE) units -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) diff --git a/packages/numlib/examples/Makefile b/packages/numlib/examples/Makefile index df5c5dfdff..c116872260 100644 --- a/packages/numlib/examples/Makefile +++ b/packages/numlib/examples/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/02] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] # 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 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-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 +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 +UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -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 @@ -326,6 +326,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex endif @@ -389,6 +395,9 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex +endif ifeq ($(FULL_TARGET),x86_64-darwin) override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex endif @@ -440,6 +449,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) endif @@ -500,6 +512,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) endif @@ -563,6 +581,9 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) +endif ifeq ($(FULL_TARGET),x86_64-darwin) override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) endif @@ -614,6 +635,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-gl endif @@ -674,6 +698,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_OPTIONS+=-gl endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-gl +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-gl +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-gl endif @@ -737,6 +767,9 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-gl endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-gl +endif ifeq ($(FULL_TARGET),x86_64-darwin) override COMPILER_OPTIONS+=-gl endif @@ -788,6 +821,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_OPTIONS+=-gl endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-gl +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=.. endif @@ -848,6 +884,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_UNITDIR+=.. endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_UNITDIR+=.. +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_UNITDIR+=.. +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITDIR+=.. endif @@ -911,6 +953,9 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=.. endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_UNITDIR+=.. +endif ifeq ($(FULL_TARGET),x86_64-darwin) override COMPILER_UNITDIR+=.. endif @@ -962,6 +1007,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_UNITDIR+=.. endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_UNITDIR+=.. +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1022,6 +1070,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_TARGETDIR+=. +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=. endif @@ -1085,6 +1139,9 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),x86_64-darwin) override COMPILER_TARGETDIR+=. endif @@ -1136,6 +1193,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1196,6 +1256,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1259,6 +1325,9 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),x86_64-darwin) override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1310,6 +1379,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1637,7 +1709,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -1652,6 +1724,10 @@ ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2137,6 +2213,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2200,6 +2282,9 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 endif @@ -2251,6 +2336,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_RTL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2260,9 +2348,9 @@ else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif ifdef CHECKDEPEND -$(PACKAGEDIR_RTL)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE) +$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE) endif else PACKAGEDIR_RTL= @@ -2640,7 +2728,7 @@ ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) ifdef USETAR ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) -ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) * +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * else ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * @@ -2685,6 +2773,9 @@ fpc_zipdistinstall: ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) endif +ifdef CLEAN_PROGRAMS +override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +endif ifdef CLEAN_UNITS override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) endif @@ -2731,6 +2822,9 @@ endif ifdef CLEANRSTFILES -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES)) endif +endif +ifdef CLEAN_FILES + -$(DEL) $(CLEAN_FILES) endif -$(DELTREE) units -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -- cgit v1.2.1