diff options
author | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2014-02-07 12:37:17 +0000 |
---|---|---|
committer | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2014-02-07 12:37:17 +0000 |
commit | 35be4cdf407935cb6e2e2586a9feffa0a0c979ea (patch) | |
tree | 6c9f19205e25e4edff60549bf20584f702fa900e /packages/libsee | |
parent | 0e9b1d3f26d1267fa2c2d59fd35440c941daa447 (diff) | |
download | fpc-35be4cdf407935cb6e2e2586a9feffa0a0c979ea.tar.gz |
* mipsel-android: Regenerated makefiles. From now the mipsel-android target can be built and used.
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@26705 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/libsee')
-rw-r--r-- | packages/libsee/Makefile | 27 | ||||
-rw-r--r-- | packages/libsee/examples/Makefile | 34 |
2 files changed, 51 insertions, 10 deletions
diff --git a/packages/libsee/Makefile b/packages/libsee/Makefile index 1686dd74e0..46bf87291d 100644 --- a/packages/libsee/Makefile +++ b/packages/libsee/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-04-26 rev 24324] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-02-06 rev 26692] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos @@ -276,7 +276,7 @@ else ifeq ($(CPU_TARGET),i386) BINUTILSPREFIX=i686-linux-android- else -ifeq ($(CPU_TARGET),mips) +ifeq ($(CPU_TARGET),mipsel) BINUTILSPREFIX=mipsel-linux-android- endif endif @@ -711,7 +711,7 @@ endif endif ifeq ($(OS_TARGET),msdos) STATICLIBPREFIX= -STATICLIBEXT=.lib +STATICLIBEXT=.a SHORTSUFFIX=d16 endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) @@ -903,6 +903,7 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc +NASMNAME=$(BINUTILSPREFIX)nasm ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -931,10 +932,18 @@ else ARPROG=$(ARNAME) endif endif +ifndef NASMPROG +ifdef CROSSBINDIR +NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT) +else +NASMPROG=$(NASMNAME) +endif +endif AS=$(ASPROG) LD=$(LDPROG) RC=$(RCPROG) AR=$(ARPROG) +NASM=$(NASMPROG) ifdef inUnix PPAS=./ppas$(SRCBATCHEXT) else @@ -1520,6 +1529,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif +ifeq ($(FULL_TARGET),mipsel-android) +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),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1914,7 +1931,7 @@ endif ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif -override COMPILER:=$(FPC) $(FPCOPT) +override COMPILER:=$(strip $(FPC) $(FPCOPT)) ifeq (,$(findstring -s ,$(COMPILER))) EXECPPAS= else diff --git a/packages/libsee/examples/Makefile b/packages/libsee/examples/Makefile index 8c9e154b40..045b08c9c5 100644 --- a/packages/libsee/examples/Makefile +++ b/packages/libsee/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-04-26 rev 24324] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-02-06 rev 26692] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos @@ -276,7 +276,7 @@ else ifeq ($(CPU_TARGET),i386) BINUTILSPREFIX=i686-linux-android- else -ifeq ($(CPU_TARGET),mips) +ifeq ($(CPU_TARGET),mipsel) BINUTILSPREFIX=mipsel-linux-android- endif endif @@ -529,6 +529,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=teststream testwrite tlibsee endif +ifeq ($(FULL_TARGET),mipsel-android) +override TARGET_PROGRAMS+=teststream testwrite tlibsee +endif ifeq ($(FULL_TARGET),jvm-java) override TARGET_PROGRAMS+=teststream testwrite tlibsee endif @@ -748,6 +751,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp endif +ifeq ($(FULL_TARGET),mipsel-android) +override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp +endif ifeq ($(FULL_TARGET),jvm-java) override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp endif @@ -1139,7 +1145,7 @@ endif endif ifeq ($(OS_TARGET),msdos) STATICLIBPREFIX= -STATICLIBEXT=.lib +STATICLIBEXT=.a SHORTSUFFIX=d16 endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) @@ -1331,6 +1337,7 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc +NASMNAME=$(BINUTILSPREFIX)nasm ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1359,10 +1366,18 @@ else ARPROG=$(ARNAME) endif endif +ifndef NASMPROG +ifdef CROSSBINDIR +NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT) +else +NASMPROG=$(NASMNAME) +endif +endif AS=$(ASPROG) LD=$(LDPROG) RC=$(RCPROG) AR=$(ARPROG) +NASM=$(NASMPROG) ifdef inUnix PPAS=./ppas$(SRCBATCHEXT) else @@ -2018,6 +2033,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBSEE=1 endif +ifeq ($(FULL_TARGET),mipsel-android) +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_LIBSEE=1 +endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2453,7 +2477,7 @@ endif ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif -override COMPILER:=$(FPC) $(FPCOPT) +override COMPILER:=$(strip $(FPC) $(FPCOPT)) ifeq (,$(findstring -s ,$(COMPILER))) EXECPPAS= else |