diff --git a/packages/extra/Makefile b/packages/extra/Makefile index 9571d5831f..029e5f76cf 100644 --- a/packages/extra/Makefile +++ b/packages/extra/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -944,6 +947,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/bfd/Makefile b/packages/extra/bfd/Makefile index 501643f872..60c665ef12 100644 --- a/packages/extra/bfd/Makefile +++ b/packages/extra/bfd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -918,6 +921,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/cdrom/Makefile b/packages/extra/cdrom/Makefile index da28504235..960fc7da1d 100644 --- a/packages/extra/cdrom/Makefile +++ b/packages/extra/cdrom/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -925,6 +928,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/cmem/Makefile b/packages/extra/cmem/Makefile index 9fd3c48534..4ded19ba53 100644 --- a/packages/extra/cmem/Makefile +++ b/packages/extra/cmem/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -919,6 +922,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/forms/Makefile b/packages/extra/forms/Makefile index ecd21992c4..29271dc443 100644 --- a/packages/extra/forms/Makefile +++ b/packages/extra/forms/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -413,7 +416,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -939,6 +942,12 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/forms/demo/Makefile b/packages/extra/forms/demo/Makefile index 1c700c6781..b021366723 100644 --- a/packages/extra/forms/demo/Makefile +++ b/packages/extra/forms/demo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -409,7 +412,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -940,6 +943,13 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_FORMS=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_FORMS=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/fpgtk/Makefile b/packages/extra/fpgtk/Makefile index 78a208413f..4d3a28f67b 100644 --- a/packages/extra/fpgtk/Makefile +++ b/packages/extra/fpgtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -412,7 +415,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -917,6 +920,7 @@ REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -933,6 +937,7 @@ REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -949,6 +954,7 @@ REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -965,6 +971,7 @@ REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -981,6 +988,24 @@ REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_MYSQL=1 +REQUIRE_PACKAGES_IBASE=1 +REQUIRE_PACKAGES_SQLITE=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_NETDB=1 +REQUIRE_PACKAGES_LIBASYNC=1 +REQUIRE_PACKAGES_PTHREADS=1 +REQUIRE_PACKAGES_FCL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -994,6 +1019,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1006,6 +1032,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1019,6 +1046,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1033,6 +1061,7 @@ REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1049,6 +1078,7 @@ REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1062,6 +1092,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1075,6 +1106,7 @@ REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1090,6 +1122,7 @@ REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1105,6 +1138,7 @@ REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1120,6 +1154,7 @@ REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1133,6 +1168,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1144,6 +1180,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1155,6 +1192,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1166,6 +1204,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1177,6 +1216,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1188,6 +1228,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1201,6 +1242,7 @@ REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1216,6 +1258,7 @@ REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1229,6 +1272,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1240,6 +1284,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1251,6 +1296,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1265,6 +1311,7 @@ REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1277,6 +1324,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1288,6 +1336,7 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1475,6 +1524,32 @@ ifdef UNITDIR_GTK override COMPILER_UNITDIR+=$(UNITDIR_GTK) endif endif +ifdef REQUIRE_PACKAGES_PASJPEG +PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASJPEG),) +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/$(OS_TARGET)),) +UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/$(OS_TARGET) +else +UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASJPEG)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASJPEG)/$(FPCMADE) +endif +else +PACKAGEDIR_PASJPEG= +UNITDIR_PASJPEG:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASJPEG),) +UNITDIR_PASJPEG:=$(firstword $(UNITDIR_PASJPEG)) +else +UNITDIR_PASJPEG= +endif +endif +ifdef UNITDIR_PASJPEG +override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) +endif +endif ifdef REQUIRE_PACKAGES_MYSQL PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_MYSQL),) diff --git a/packages/extra/gdbm/Makefile b/packages/extra/gdbm/Makefile index 1c14d4818a..d5f8043e45 100644 --- a/packages/extra/gdbm/Makefile +++ b/packages/extra/gdbm/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -919,6 +922,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/ggi/Makefile b/packages/extra/ggi/Makefile index 2687882970..a60fe1a5de 100644 --- a/packages/extra/ggi/Makefile +++ b/packages/extra/ggi/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -412,7 +415,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -933,6 +936,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gnome1/Makefile b/packages/extra/gnome1/Makefile index 025a2137af..ccf2e2c209 100644 --- a/packages/extra/gnome1/Makefile +++ b/packages/extra/gnome1/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -917,6 +920,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gnome1/gconf/Makefile b/packages/extra/gnome1/gconf/Makefile index dda9744f1a..138f4734f3 100644 --- a/packages/extra/gnome1/gconf/Makefile +++ b/packages/extra/gnome1/gconf/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -414,7 +417,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -950,6 +953,14 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gnome1/gconf/examples/Makefile b/packages/extra/gnome1/gconf/examples/Makefile index 5304c775c3..6b82ba7544 100644 --- a/packages/extra/gnome1/gconf/examples/Makefile +++ b/packages/extra/gnome1/gconf/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -410,7 +413,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -951,6 +954,15 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_GNOME1/GCONF=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gnome1/gnome/Makefile b/packages/extra/gnome1/gnome/Makefile index 845a3cadcc..6e98849863 100644 --- a/packages/extra/gnome1/gnome/Makefile +++ b/packages/extra/gnome1/gnome/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -413,7 +416,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -954,6 +957,15 @@ REQUIRE_PACKAGES_IMLIB=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gnome1/zvt/Makefile b/packages/extra/gnome1/zvt/Makefile index c1f6ff7454..e0e9b151f0 100644 --- a/packages/extra/gnome1/zvt/Makefile +++ b/packages/extra/gnome1/zvt/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -414,7 +417,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -955,6 +958,15 @@ REQUIRE_PACKAGES_IMLIB=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gnome1/zvt/examples/Makefile b/packages/extra/gnome1/zvt/examples/Makefile index 0ce3978e6d..d69b78ad7a 100644 --- a/packages/extra/gnome1/zvt/examples/Makefile +++ b/packages/extra/gnome1/zvt/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -410,7 +413,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -961,6 +964,17 @@ REQUIRE_PACKAGES_GNOME1/GNOME=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 +REQUIRE_PACKAGES_GNOME1/ZVT=1 +REQUIRE_PACKAGES_GNOME1/GNOME=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gtk/Makefile b/packages/extra/gtk/Makefile index 26121b1d6c..5492762b6f 100644 --- a/packages/extra/gtk/Makefile +++ b/packages/extra/gtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -415,7 +418,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -946,6 +949,13 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gtk/examples/Makefile b/packages/extra/gtk/examples/Makefile index 3475c3ec83..bba734f88b 100644 --- a/packages/extra/gtk/examples/Makefile +++ b/packages/extra/gtk/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -411,7 +414,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -947,6 +950,14 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gtk/examples/tutorial/Makefile b/packages/extra/gtk/examples/tutorial/Makefile index d639eb31be..e6e85a4558 100644 --- a/packages/extra/gtk/examples/tutorial/Makefile +++ b/packages/extra/gtk/examples/tutorial/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -408,7 +411,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -944,6 +947,14 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/gtk/gtkgl/Makefile b/packages/extra/gtk/gtkgl/Makefile index af6fd7dc47..3e69f9772b 100644 --- a/packages/extra/gtk/gtkgl/Makefile +++ b/packages/extra/gtk/gtkgl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -412,7 +415,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -943,6 +946,13 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/imlib/Makefile b/packages/extra/imlib/Makefile index db6868eacf..298c2ac504 100644 --- a/packages/extra/imlib/Makefile +++ b/packages/extra/imlib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -414,7 +417,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -950,6 +953,14 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GTK=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/libgd/Makefile b/packages/extra/libgd/Makefile index ba8786fb8c..f8abf70cfe 100644 --- a/packages/extra/libgd/Makefile +++ b/packages/extra/libgd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -412,7 +415,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -933,6 +936,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/libpng/Makefile b/packages/extra/libpng/Makefile index 64b7e3f269..e076bb9e1f 100644 --- a/packages/extra/libpng/Makefile +++ b/packages/extra/libpng/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -411,7 +414,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -937,6 +940,12 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ZLIB=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/mmsystem/Makefile b/packages/extra/mmsystem/Makefile index 9441d0a18b..f41f9e8136 100644 --- a/packages/extra/mmsystem/Makefile +++ b/packages/extra/mmsystem/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -918,6 +921,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/ncurses/Makefile b/packages/extra/ncurses/Makefile index 7cad9c9b77..1de0cb541a 100644 --- a/packages/extra/ncurses/Makefile +++ b/packages/extra/ncurses/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -412,7 +415,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -933,6 +936,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/opengl/Makefile b/packages/extra/opengl/Makefile index 52f914c7e8..9c6ba21ac4 100644 --- a/packages/extra/opengl/Makefile +++ b/packages/extra/opengl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -424,7 +427,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -950,6 +953,12 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/opengl/examples/Makefile b/packages/extra/opengl/examples/Makefile index 2f5f318bd1..394c4c4c31 100644 --- a/packages/extra/opengl/examples/Makefile +++ b/packages/extra/opengl/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -410,7 +413,7 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -941,6 +944,13 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/os2units/clkdll/Makefile b/packages/extra/os2units/clkdll/Makefile index d68559d8ab..1871bbffbc 100644 --- a/packages/extra/os2units/clkdll/Makefile +++ b/packages/extra/os2units/clkdll/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -919,6 +922,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/extra/os2units/ftpapi/Makefile b/packages/extra/os2units/ftpapi/Makefile index 860e6d4ea3..2e4551ce97 100644 --- a/packages/extra/os2units/ftpapi/Makefile +++ b/packages/extra/os2units/ftpapi/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -919,6 +922,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1