diff options
Diffstat (limited to 'packages/libogcfpc')
32 files changed, 110 insertions, 4872 deletions
diff --git a/packages/libogcfpc/Makefile b/packages/libogcfpc/Makefile index 20d5c1ae82..23bdcda637 100644 --- a/packages/libogcfpc/Makefile +++ b/packages/libogcfpc/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -332,7 +326,7 @@ FPCFPMAKE=$(FPC) endif endif override PACKAGE_NAME=libogcfpc -override PACKAGE_VERSION=3.0.3 +override PACKAGE_VERSION=3.0.5 FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT)) ifdef OS_TARGET FPC_TARGETOPT+=--os=$(OS_TARGET) @@ -737,21 +731,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1431,22 +1410,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1527,14 +1490,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1639,14 +1594,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1655,30 +1602,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1919,7 +1842,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -1932,7 +1854,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2032,9 +1953,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2133,7 +2051,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -2305,10 +2223,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/Makefile.fpc b/packages/libogcfpc/Makefile.fpc index 1cb97d424f..f87bc0bab4 100644 --- a/packages/libogcfpc/Makefile.fpc +++ b/packages/libogcfpc/Makefile.fpc @@ -4,7 +4,7 @@ [package] name=libogcfpc -version=3.0.3 +version=3.0.5 [require] packages=rtl fpmkunit diff --git a/packages/libogcfpc/Makefile.fpc.fpcmake b/packages/libogcfpc/Makefile.fpc.fpcmake index 94c4635498..31f2aa7e76 100644 --- a/packages/libogcfpc/Makefile.fpc.fpcmake +++ b/packages/libogcfpc/Makefile.fpc.fpcmake @@ -4,7 +4,7 @@ [package] name=libogcfpc -version=3.0.3 +version=3.0.5 [target] units=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network diff --git a/packages/libogcfpc/examples/Makefile b/packages/libogcfpc/examples/Makefile index d889fd1cb7..94c2a07b26 100644 --- a/packages/libogcfpc/examples/Makefile +++ b/packages/libogcfpc/examples/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=audio devices filesystem graphics template endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=audio devices filesystem graphics template -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=audio devices filesystem graphics template -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=audio devices filesystem graphics template endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=audio devices filesystem graphics template endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=audio devices filesystem graphics template -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=audio devices filesystem graphics template endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=audio devices filesystem graphics template endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=audio devices filesystem graphics template -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=audio devices filesystem graphics template endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=audio devices filesystem graphics template -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=audio devices filesystem graphics template -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=audio devices filesystem graphics template -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1779,26 +1737,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1899,16 +1837,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2039,16 +1967,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2059,36 +1977,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2405,7 +2293,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2418,7 +2305,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2518,9 +2404,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2638,10 +2521,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -3121,20 +3000,6 @@ TARGET_DIRS_FILESYSTEM=1 TARGET_DIRS_GRAPHICS=1 TARGET_DIRS_TEMPLATE=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_DEVICES=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_TEMPLATE=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_DEVICES=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_TEMPLATE=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_AUDIO=1 TARGET_DIRS_DEVICES=1 @@ -3205,13 +3070,6 @@ TARGET_DIRS_FILESYSTEM=1 TARGET_DIRS_GRAPHICS=1 TARGET_DIRS_TEMPLATE=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_DEVICES=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_TEMPLATE=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_AUDIO=1 TARGET_DIRS_DEVICES=1 @@ -3303,13 +3161,6 @@ TARGET_DIRS_FILESYSTEM=1 TARGET_DIRS_GRAPHICS=1 TARGET_DIRS_TEMPLATE=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_DEVICES=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_TEMPLATE=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_AUDIO=1 TARGET_DIRS_DEVICES=1 @@ -3317,27 +3168,6 @@ TARGET_DIRS_FILESYSTEM=1 TARGET_DIRS_GRAPHICS=1 TARGET_DIRS_TEMPLATE=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_DEVICES=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_TEMPLATE=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_DEVICES=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_TEMPLATE=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_DEVICES=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_TEMPLATE=1 -endif ifdef TARGET_DIRS_AUDIO audio_all: $(MAKE) -C audio all diff --git a/packages/libogcfpc/examples/audio/Makefile b/packages/libogcfpc/examples/audio/Makefile index eb117bbaa0..13aa2b6696 100644 --- a/packages/libogcfpc/examples/audio/Makefile +++ b/packages/libogcfpc/examples/audio/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=modplay mp3player endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=modplay mp3player -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=modplay mp3player -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=modplay mp3player endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=modplay mp3player endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=modplay mp3player -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=modplay mp3player endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=modplay mp3player endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=modplay mp3player -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=modplay mp3player endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=modplay mp3player -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=modplay mp3player -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=modplay mp3player -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1779,26 +1737,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1899,16 +1837,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2039,16 +1967,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2059,36 +1977,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2405,7 +2293,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2418,7 +2305,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2518,9 +2404,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2638,10 +2521,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2962,14 +2841,6 @@ ifeq ($(FULL_TARGET),x86_64-embedded) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_MODPLAY=1 -TARGET_DIRS_MP3PLAYER=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_MODPLAY=1 -TARGET_DIRS_MP3PLAYER=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 @@ -3010,10 +2881,6 @@ ifeq ($(FULL_TARGET),arm-android) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_MODPLAY=1 -TARGET_DIRS_MP3PLAYER=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 @@ -3066,26 +2933,10 @@ ifeq ($(FULL_TARGET),jvm-android) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_MODPLAY=1 -TARGET_DIRS_MP3PLAYER=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_MODPLAY=1 -TARGET_DIRS_MP3PLAYER=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_MODPLAY=1 -TARGET_DIRS_MP3PLAYER=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_MODPLAY=1 -TARGET_DIRS_MP3PLAYER=1 -endif ifdef TARGET_DIRS_MODPLAY modplay_all: $(MAKE) -C modplay all diff --git a/packages/libogcfpc/examples/audio/modplay/Makefile b/packages/libogcfpc/examples/audio/modplay/Makefile index 8ac729823c..d8002e945d 100644 --- a/packages/libogcfpc/examples/audio/modplay/Makefile +++ b/packages/libogcfpc/examples/audio/modplay/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=modplay endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=modplay -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=modplay -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=modplay endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=modplay endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=modplay -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=modplay endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=modplay endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=modplay -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=modplay endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=modplay -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=modplay -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=modplay -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/audio/mp3player/Makefile b/packages/libogcfpc/examples/audio/mp3player/Makefile index 522d4fe4be..f632470870 100644 --- a/packages/libogcfpc/examples/audio/mp3player/Makefile +++ b/packages/libogcfpc/examples/audio/mp3player/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=playmp3 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=playmp3 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=playmp3 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=playmp3 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=playmp3 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=playmp3 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=playmp3 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=playmp3 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=playmp3 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=playmp3 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=playmp3 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=playmp3 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=playmp3 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2543,26 +2438,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2663,16 +2538,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2803,16 +2668,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2823,36 +2678,6 @@ REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 REQUIRE_PACKAGES_MAD=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -REQUIRE_PACKAGES_MAD=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3169,7 +2994,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3182,7 +3006,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3282,9 +3105,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3476,7 +3296,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3562,10 +3382,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/devices/Makefile b/packages/libogcfpc/examples/devices/Makefile index 807cf2986d..01d8625a88 100644 --- a/packages/libogcfpc/examples/devices/Makefile +++ b/packages/libogcfpc/examples/devices/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=network usbkeyboard usbgecko endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=network usbkeyboard usbgecko -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=network usbkeyboard usbgecko -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=network usbkeyboard usbgecko endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=network usbkeyboard usbgecko endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=network usbkeyboard usbgecko -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=network usbkeyboard usbgecko endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=network usbkeyboard usbgecko endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=network usbkeyboard usbgecko -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=network usbkeyboard usbgecko endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=network usbkeyboard usbgecko -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=network usbkeyboard usbgecko -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=network usbkeyboard usbgecko -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2893,16 +2779,6 @@ TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 TARGET_DIRS_USBGECKO=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_NETWORK=1 -TARGET_DIRS_USBKEYBOARD=1 -TARGET_DIRS_USBGECKO=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_NETWORK=1 -TARGET_DIRS_USBKEYBOARD=1 -TARGET_DIRS_USBGECKO=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 @@ -2953,11 +2829,6 @@ TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 TARGET_DIRS_USBGECKO=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_NETWORK=1 -TARGET_DIRS_USBKEYBOARD=1 -TARGET_DIRS_USBGECKO=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 @@ -3023,31 +2894,11 @@ TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 TARGET_DIRS_USBGECKO=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_NETWORK=1 -TARGET_DIRS_USBKEYBOARD=1 -TARGET_DIRS_USBGECKO=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 TARGET_DIRS_USBGECKO=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_NETWORK=1 -TARGET_DIRS_USBKEYBOARD=1 -TARGET_DIRS_USBGECKO=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_NETWORK=1 -TARGET_DIRS_USBKEYBOARD=1 -TARGET_DIRS_USBGECKO=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_NETWORK=1 -TARGET_DIRS_USBKEYBOARD=1 -TARGET_DIRS_USBGECKO=1 -endif ifdef TARGET_DIRS_NETWORK network_all: $(MAKE) -C network all diff --git a/packages/libogcfpc/examples/devices/network/Makefile b/packages/libogcfpc/examples/devices/network/Makefile index c7bc7ad932..032e56c611 100644 --- a/packages/libogcfpc/examples/devices/network/Makefile +++ b/packages/libogcfpc/examples/devices/network/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=sockettest endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=sockettest -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=sockettest -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=sockettest endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=sockettest endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=sockettest -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=sockettest endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=sockettest endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=sockettest -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=sockettest endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=sockettest -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=sockettest -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=sockettest -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2787,12 +2673,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) TARGET_DIRS_SOCKETTEST=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_SOCKETTEST=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_SOCKETTEST=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_SOCKETTEST=1 endif @@ -2823,9 +2703,6 @@ endif ifeq ($(FULL_TARGET),arm-android) TARGET_DIRS_SOCKETTEST=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_SOCKETTEST=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_SOCKETTEST=1 endif @@ -2865,21 +2742,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) TARGET_DIRS_SOCKETTEST=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_SOCKETTEST=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_SOCKETTEST=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_SOCKETTEST=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_SOCKETTEST=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_SOCKETTEST=1 -endif ifdef TARGET_DIRS_SOCKETTEST sockettest_all: $(MAKE) -C sockettest all diff --git a/packages/libogcfpc/examples/devices/network/sockettest/Makefile b/packages/libogcfpc/examples/devices/network/sockettest/Makefile index 7bcd4d5d40..22d1beb53c 100644 --- a/packages/libogcfpc/examples/devices/network/sockettest/Makefile +++ b/packages/libogcfpc/examples/devices/network/sockettest/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=sockettest endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=sockettest -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=sockettest -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=sockettest endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=sockettest endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=sockettest -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=sockettest endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=sockettest endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=sockettest -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=sockettest endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=sockettest -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=sockettest -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=sockettest -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/devices/usbgecko/Makefile b/packages/libogcfpc/examples/devices/usbgecko/Makefile index 2895b69838..15701c5b84 100644 --- a/packages/libogcfpc/examples/devices/usbgecko/Makefile +++ b/packages/libogcfpc/examples/devices/usbgecko/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=gdbstub endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=gdbstub -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=gdbstub -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=gdbstub endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=gdbstub endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=gdbstub -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=gdbstub endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=gdbstub endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=gdbstub -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=gdbstub endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=gdbstub -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=gdbstub -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=gdbstub -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2787,12 +2673,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) TARGET_DIRS_GDBSTUB=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_GDBSTUB=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_GDBSTUB=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_GDBSTUB=1 endif @@ -2823,9 +2703,6 @@ endif ifeq ($(FULL_TARGET),arm-android) TARGET_DIRS_GDBSTUB=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_GDBSTUB=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_GDBSTUB=1 endif @@ -2865,21 +2742,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) TARGET_DIRS_GDBSTUB=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_GDBSTUB=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_GDBSTUB=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_GDBSTUB=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_GDBSTUB=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_GDBSTUB=1 -endif ifdef TARGET_DIRS_GDBSTUB gdbstub_all: $(MAKE) -C gdbstub all diff --git a/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile b/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile index a55d87f556..ddcc8e47f7 100644 --- a/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile +++ b/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=gdbstub endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=gdbstub -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=gdbstub -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=gdbstub endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=gdbstub endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=gdbstub -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=gdbstub endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=gdbstub endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=gdbstub -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=gdbstub endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=gdbstub -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=gdbstub -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=gdbstub -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -k--gc-sections -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -k--gc-sections -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -k--gc-sections -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -k--gc-sections -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -k--gc-sections -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -k--gc-sections -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -k--gc-sections -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/devices/usbkeyboard/Makefile b/packages/libogcfpc/examples/devices/usbkeyboard/Makefile index 935eb81eb6..66cc4c0b9e 100644 --- a/packages/libogcfpc/examples/devices/usbkeyboard/Makefile +++ b/packages/libogcfpc/examples/devices/usbkeyboard/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=basic_stdin endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=basic_stdin -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=basic_stdin -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=basic_stdin endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=basic_stdin endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=basic_stdin -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=basic_stdin endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=basic_stdin endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=basic_stdin -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=basic_stdin endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=basic_stdin -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=basic_stdin -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=basic_stdin -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2787,12 +2673,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) TARGET_DIRS_BASIC_STDIN=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_BASIC_STDIN=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_BASIC_STDIN=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_BASIC_STDIN=1 endif @@ -2823,9 +2703,6 @@ endif ifeq ($(FULL_TARGET),arm-android) TARGET_DIRS_BASIC_STDIN=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_BASIC_STDIN=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_BASIC_STDIN=1 endif @@ -2865,21 +2742,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) TARGET_DIRS_BASIC_STDIN=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_BASIC_STDIN=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_BASIC_STDIN=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_BASIC_STDIN=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_BASIC_STDIN=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_BASIC_STDIN=1 -endif ifdef TARGET_DIRS_BASIC_STDIN basic_stdin_all: $(MAKE) -C basic_stdin all diff --git a/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile b/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile index dc8652bd6a..de92819410 100644 --- a/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile +++ b/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=basic_stdin endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=basic_stdin -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=basic_stdin -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=basic_stdin endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=basic_stdin endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=basic_stdin -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=basic_stdin endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=basic_stdin endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=basic_stdin -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=basic_stdin endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=basic_stdin -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=basic_stdin -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=basic_stdin -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/filesystem/Makefile b/packages/libogcfpc/examples/filesystem/Makefile index 3c2a78e406..552d8e12d7 100644 --- a/packages/libogcfpc/examples/filesystem/Makefile +++ b/packages/libogcfpc/examples/filesystem/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=directory endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=directory -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=directory -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=directory endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=directory endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=directory -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=directory endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=directory endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=directory -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=directory endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=directory -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=directory -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=directory -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2787,12 +2673,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) TARGET_DIRS_DIRECTORY=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_DIRECTORY=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_DIRECTORY=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_DIRECTORY=1 endif @@ -2823,9 +2703,6 @@ endif ifeq ($(FULL_TARGET),arm-android) TARGET_DIRS_DIRECTORY=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_DIRECTORY=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_DIRECTORY=1 endif @@ -2865,21 +2742,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) TARGET_DIRS_DIRECTORY=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_DIRECTORY=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_DIRECTORY=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_DIRECTORY=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_DIRECTORY=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_DIRECTORY=1 -endif ifdef TARGET_DIRS_DIRECTORY directory_all: $(MAKE) -C directory all diff --git a/packages/libogcfpc/examples/filesystem/directory/Makefile b/packages/libogcfpc/examples/filesystem/directory/Makefile index 7fc54444c1..47e0f4e1f2 100644 --- a/packages/libogcfpc/examples/filesystem/directory/Makefile +++ b/packages/libogcfpc/examples/filesystem/directory/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=directory endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=directory -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=directory -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=directory endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=directory endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=directory -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=directory endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=directory endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=directory -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=directory endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=directory -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=directory -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=directory -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/Makefile b/packages/libogcfpc/examples/graphics/Makefile index cd5c49402e..f9ffab0eaa 100644 --- a/packages/libogcfpc/examples/graphics/Makefile +++ b/packages/libogcfpc/examples/graphics/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=gx endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=gx -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=gx -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=gx endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=gx endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=gx -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=gx endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=gx endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=gx -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=gx endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=gx -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=gx -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=gx -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2787,12 +2673,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) TARGET_DIRS_GX=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_GX=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_GX=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_GX=1 endif @@ -2823,9 +2703,6 @@ endif ifeq ($(FULL_TARGET),arm-android) TARGET_DIRS_GX=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_GX=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_GX=1 endif @@ -2865,21 +2742,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) TARGET_DIRS_GX=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_GX=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_GX=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_GX=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_GX=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_GX=1 -endif ifdef TARGET_DIRS_GX gx_all: $(MAKE) -C gx all diff --git a/packages/libogcfpc/examples/graphics/gx/Makefile b/packages/libogcfpc/examples/graphics/gx/Makefile index 696cacd651..13d96d396c 100644 --- a/packages/libogcfpc/examples/graphics/gx/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=gxSprites neheGX triangle endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=gxSprites neheGX triangle -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=gxSprites neheGX triangle -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=gxSprites neheGX triangle endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=gxSprites neheGX triangle endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=gxSprites neheGX triangle -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=gxSprites neheGX triangle endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=gxSprites neheGX triangle endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=gxSprites neheGX triangle -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=gxSprites neheGX triangle endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=gxSprites neheGX triangle -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=gxSprites neheGX triangle -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=gxSprites neheGX triangle -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2893,16 +2779,6 @@ TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 TARGET_DIRS_TRIANGLE=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_GXSPRITES=1 -TARGET_DIRS_NEHEGX=1 -TARGET_DIRS_TRIANGLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_GXSPRITES=1 -TARGET_DIRS_NEHEGX=1 -TARGET_DIRS_TRIANGLE=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 @@ -2953,11 +2829,6 @@ TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 TARGET_DIRS_TRIANGLE=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_GXSPRITES=1 -TARGET_DIRS_NEHEGX=1 -TARGET_DIRS_TRIANGLE=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 @@ -3023,31 +2894,11 @@ TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 TARGET_DIRS_TRIANGLE=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_GXSPRITES=1 -TARGET_DIRS_NEHEGX=1 -TARGET_DIRS_TRIANGLE=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 TARGET_DIRS_TRIANGLE=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_GXSPRITES=1 -TARGET_DIRS_NEHEGX=1 -TARGET_DIRS_TRIANGLE=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_GXSPRITES=1 -TARGET_DIRS_NEHEGX=1 -TARGET_DIRS_TRIANGLE=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_GXSPRITES=1 -TARGET_DIRS_NEHEGX=1 -TARGET_DIRS_TRIANGLE=1 -endif ifdef TARGET_DIRS_GXSPRITES gxSprites_all: $(MAKE) -C gxSprites all diff --git a/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile b/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile index 320c1723f7..bef4c2f1ec 100644 --- a/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=gxsprites endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=gxsprites -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=gxsprites -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=gxsprites endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=gxsprites endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=gxsprites -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=gxsprites endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=gxsprites endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=gxsprites -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=gxsprites endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=gxsprites -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=gxsprites -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=gxsprites -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile index 8d76bad08e..f275035683 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -3211,28 +3097,6 @@ TARGET_DIRS_LESSON7=1 TARGET_DIRS_LESSON8=1 TARGET_DIRS_LESSON9=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_LESSON1=1 -TARGET_DIRS_LESSON2=1 -TARGET_DIRS_LESSON3=1 -TARGET_DIRS_LESSON4=1 -TARGET_DIRS_LESSON5=1 -TARGET_DIRS_LESSON6=1 -TARGET_DIRS_LESSON7=1 -TARGET_DIRS_LESSON8=1 -TARGET_DIRS_LESSON9=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_LESSON1=1 -TARGET_DIRS_LESSON2=1 -TARGET_DIRS_LESSON3=1 -TARGET_DIRS_LESSON4=1 -TARGET_DIRS_LESSON5=1 -TARGET_DIRS_LESSON6=1 -TARGET_DIRS_LESSON7=1 -TARGET_DIRS_LESSON8=1 -TARGET_DIRS_LESSON9=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_LESSON1=1 TARGET_DIRS_LESSON2=1 @@ -3343,17 +3207,6 @@ TARGET_DIRS_LESSON7=1 TARGET_DIRS_LESSON8=1 TARGET_DIRS_LESSON9=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_LESSON1=1 -TARGET_DIRS_LESSON2=1 -TARGET_DIRS_LESSON3=1 -TARGET_DIRS_LESSON4=1 -TARGET_DIRS_LESSON5=1 -TARGET_DIRS_LESSON6=1 -TARGET_DIRS_LESSON7=1 -TARGET_DIRS_LESSON8=1 -TARGET_DIRS_LESSON9=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_LESSON1=1 TARGET_DIRS_LESSON2=1 @@ -3497,17 +3350,6 @@ TARGET_DIRS_LESSON7=1 TARGET_DIRS_LESSON8=1 TARGET_DIRS_LESSON9=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_LESSON1=1 -TARGET_DIRS_LESSON2=1 -TARGET_DIRS_LESSON3=1 -TARGET_DIRS_LESSON4=1 -TARGET_DIRS_LESSON5=1 -TARGET_DIRS_LESSON6=1 -TARGET_DIRS_LESSON7=1 -TARGET_DIRS_LESSON8=1 -TARGET_DIRS_LESSON9=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_LESSON1=1 TARGET_DIRS_LESSON2=1 @@ -3519,39 +3361,6 @@ TARGET_DIRS_LESSON7=1 TARGET_DIRS_LESSON8=1 TARGET_DIRS_LESSON9=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_LESSON1=1 -TARGET_DIRS_LESSON2=1 -TARGET_DIRS_LESSON3=1 -TARGET_DIRS_LESSON4=1 -TARGET_DIRS_LESSON5=1 -TARGET_DIRS_LESSON6=1 -TARGET_DIRS_LESSON7=1 -TARGET_DIRS_LESSON8=1 -TARGET_DIRS_LESSON9=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_LESSON1=1 -TARGET_DIRS_LESSON2=1 -TARGET_DIRS_LESSON3=1 -TARGET_DIRS_LESSON4=1 -TARGET_DIRS_LESSON5=1 -TARGET_DIRS_LESSON6=1 -TARGET_DIRS_LESSON7=1 -TARGET_DIRS_LESSON8=1 -TARGET_DIRS_LESSON9=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_LESSON1=1 -TARGET_DIRS_LESSON2=1 -TARGET_DIRS_LESSON3=1 -TARGET_DIRS_LESSON4=1 -TARGET_DIRS_LESSON5=1 -TARGET_DIRS_LESSON6=1 -TARGET_DIRS_LESSON7=1 -TARGET_DIRS_LESSON8=1 -TARGET_DIRS_LESSON9=1 -endif ifdef TARGET_DIRS_LESSON1 lesson1_all: $(MAKE) -C lesson1 all diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile index 1a4177f3ce..f11d036dca 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson1 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson1 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson1 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson1 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson1 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson1 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile index f3638682d7..296f5ab74f 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson2 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson2 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson2 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson2 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson2 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson2 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson2 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson2 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson2 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson2 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson2 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson2 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson2 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile index ce8ac1396d..d6b812326a 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson3 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson3 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson3 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson3 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson3 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson3 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson3 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson3 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson3 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson3 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson3 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson3 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson3 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile index 3e8f3c7890..a53d86e7ce 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson4 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson4 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson4 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson4 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson4 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson4 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson4 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson4 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson4 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson4 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson4 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson4 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson4 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile index 70ce316832..a31db6bd82 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson5 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson5 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson5 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson5 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson5 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson5 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson5 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson5 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson5 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson5 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson5 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson5 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson5 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile index 3b77868ed8..cfdffa542e 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson6 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson6 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson6 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson6 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson6 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson6 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson6 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson6 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson6 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson6 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson6 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson6 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson6 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile index a62f3803ac..2a074f9b8d 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson7 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson7 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson7 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson7 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson7 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson7 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson7 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson7 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson7 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson7 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson7 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson7 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson7 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile index e35da10fce..29380b7997 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson8 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson8 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson8 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson8 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson8 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson8 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson8 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson8 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson8 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson8 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson8 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson8 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson8 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile index 72a7e84dd1..09c221ba00 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson9 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson9 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson9 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson9 endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson9 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson9 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson9 endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson9 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson9 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson9 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson9 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson9 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson9 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/graphics/gx/triangle/Makefile b/packages/libogcfpc/examples/graphics/gx/triangle/Makefile index ac4fd35446..07dad0d14a 100644 --- a/packages/libogcfpc/examples/graphics/gx/triangle/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/triangle/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=triangle endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=triangle -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=triangle -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=triangle endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=triangle endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=triangle -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=triangle endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=triangle endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=triangle -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=triangle endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=triangle -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=triangle -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=triangle -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/examples/template/Makefile b/packages/libogcfpc/examples/template/Makefile index cb3d5eee80..3037fa0208 100644 --- a/packages/libogcfpc/examples/template/Makefile +++ b/packages/libogcfpc/examples/template/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-aros 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -498,12 +492,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=template endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=template -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=template -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=template endif @@ -534,9 +522,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=template endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=template -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=template endif @@ -576,21 +561,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=template endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=template -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=template endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=template -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=template -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=template -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -750,12 +723,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -786,9 +753,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -828,21 +792,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1002,12 +954,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1038,9 +984,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1080,21 +1023,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1255,12 +1186,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-g -Xm endif @@ -1291,9 +1216,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1333,21 +1255,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-g -Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-g -Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-g -Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-g -Xm -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,21 +1653,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2490,24 +2385,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2598,15 +2475,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2724,15 +2592,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2742,33 +2601,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBOGCFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBOGCFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3047,7 +2879,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3060,7 +2891,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3160,9 +2990,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3354,7 +3181,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3440,10 +3267,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libogcfpc/fpmake.pp b/packages/libogcfpc/fpmake.pp index 40edefdad9..de606a04e9 100644 --- a/packages/libogcfpc/fpmake.pp +++ b/packages/libogcfpc/fpmake.pp @@ -18,7 +18,7 @@ begin {$ifdef ALLPACKAGES} P.Directory:=ADirectory; {$endif ALLPACKAGES} - P.Version:='3.0.3'; + P.Version:='3.0.5'; P.Author := 'Library: libogc, libfat, libmad and libmodplay from devkitPPC; headers: Francesco Lombardi'; P.License := 'LGPL'; P.HomepageURL := 'www.freepascal.org'; |