diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2014-01-03 22:19:02 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2014-01-03 22:19:02 +0000 |
commit | d4794c6050b0f051cfa647ee0350527f1aab877e (patch) | |
tree | f19925127b1dbda558c4a2e21ed01a7b949d7c94 /installer | |
parent | b1ca17f789bde7ecc39a88099373d77f865ca4a5 (diff) | |
download | fpc-d4794c6050b0f051cfa647ee0350527f1aab877e.tar.gz |
* rtl-console initial version.
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@26372 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'installer')
-rw-r--r-- | installer/Makefile | 124 | ||||
-rw-r--r-- | installer/Makefile.fpc | 2 |
2 files changed, 123 insertions, 3 deletions
diff --git a/installer/Makefile b/installer/Makefile index ff91bd80c4..5d64dd6748 100644 --- a/installer/Makefile +++ b/installer/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/10/05] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-11-16 rev 26097] # 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 @@ -1420,6 +1420,7 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc +NASMNAME=$(BINUTILSPREFIX)nasm ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1448,10 +1449,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 @@ -1476,7 +1485,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fv unzip +override REQUIRE_PACKAGES=rtl rtl-console fv unzip ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1484,6 +1493,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1494,6 +1504,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1504,6 +1515,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1514,6 +1526,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1524,6 +1537,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1534,6 +1548,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1544,6 +1559,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1554,6 +1570,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1564,6 +1581,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1574,6 +1592,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1584,6 +1603,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1594,6 +1614,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1604,6 +1625,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1614,6 +1636,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1624,6 +1647,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1634,6 +1658,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1644,6 +1669,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1654,6 +1680,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1664,6 +1691,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1674,6 +1702,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1684,6 +1713,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1694,6 +1724,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1704,6 +1735,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1714,6 +1746,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1724,6 +1757,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1734,6 +1768,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1744,6 +1779,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1754,6 +1790,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1764,6 +1801,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1774,6 +1812,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1784,6 +1823,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1794,6 +1834,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1804,6 +1845,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1814,6 +1856,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1824,6 +1867,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1834,6 +1878,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1844,6 +1889,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1854,6 +1900,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1864,6 +1911,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1874,6 +1922,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1884,6 +1933,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1894,6 +1944,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1904,6 +1955,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1914,6 +1966,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1924,6 +1977,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1934,6 +1988,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1944,6 +1999,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1954,6 +2010,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1964,6 +2021,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1974,6 +2032,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1984,6 +2043,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -1994,6 +2054,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2004,6 +2065,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2014,6 +2076,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2024,6 +2087,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2034,6 +2098,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2044,6 +2109,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2054,6 +2120,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2064,6 +2131,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2074,6 +2142,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2084,6 +2153,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2094,6 +2164,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2104,6 +2175,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2114,6 +2186,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2124,6 +2197,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2134,6 +2208,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2144,6 +2219,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2154,6 +2230,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2164,6 +2241,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2174,6 +2252,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2184,6 +2263,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2194,6 +2274,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2204,6 +2285,7 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif @@ -2435,6 +2517,44 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif +ifdef REQUIRE_PACKAGES_RTL-CONSOLE +PACKAGEDIR_RTL-CONSOLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl-console/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_RTL-CONSOLE),) +ifneq ($(wildcard $(PACKAGEDIR_RTL-CONSOLE)/units/$(TARGETSUFFIX)),) +UNITDIR_RTL-CONSOLE=$(PACKAGEDIR_RTL-CONSOLE)/units/$(TARGETSUFFIX) +else +UNITDIR_RTL-CONSOLE=$(PACKAGEDIR_RTL-CONSOLE) +endif +ifneq ($(wildcard $(PACKAGEDIR_RTL-CONSOLE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL-CONSOLE=$(PACKAGEDIR_RTL-CONSOLE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL-CONSOLE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL-CONSOLE=$(PACKAGEDIR_RTL-CONSOLE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL-CONSOLE=$(PACKAGEDIR_RTL-CONSOLE) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_RTL-CONSOLE)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_RTL-CONSOLE) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL-CONSOLE)/$(FPCMADE) +endif +else +PACKAGEDIR_RTL-CONSOLE= +UNITDIR_RTL-CONSOLE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl-console/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_RTL-CONSOLE),) +UNITDIR_RTL-CONSOLE:=$(firstword $(UNITDIR_RTL-CONSOLE)) +else +UNITDIR_RTL-CONSOLE= +endif +endif +ifdef UNITDIR_RTL-CONSOLE +override COMPILER_UNITDIR+=$(UNITDIR_RTL-CONSOLE) +endif +ifdef UNITDIR_FPMAKE_RTL-CONSOLE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL-CONSOLE) +endif +endif ifdef REQUIRE_PACKAGES_FV PACKAGEDIR_FV:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fv/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_FV),) diff --git a/installer/Makefile.fpc b/installer/Makefile.fpc index 1779a1296d..4ff3a7f43a 100644 --- a/installer/Makefile.fpc +++ b/installer/Makefile.fpc @@ -19,7 +19,7 @@ files_linux=installer.pas files_freebsd=installer.pas [require] -packages=fv unzip +packages=rtl-console fv unzip [compiler] unitdir=../ide |