* fixed Makefile.fpc (forgot to add matroska to the used units)

git-svn-id: trunk@5547 -
This commit is contained in:
ivost 2006-12-06 21:33:38 +00:00
parent f7da7486a3
commit 7ce04b2394
2 changed files with 70 additions and 3 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/13]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/12/03]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@ -1097,7 +1097,7 @@ else
TAROPT=vz
TAREXT=.tar.gz
endif
override REQUIRE_PACKAGES=rtl openal mad oggvorbis a52 dts modplug
override REQUIRE_PACKAGES=rtl openal mad oggvorbis a52 dts modplug matroska
ifeq ($(FULL_TARGET),i386-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENAL=1
@ -1106,6 +1106,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-go32v2)
REQUIRE_PACKAGES_RTL=1
@ -1115,6 +1116,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-win32)
REQUIRE_PACKAGES_RTL=1
@ -1124,6 +1126,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-os2)
REQUIRE_PACKAGES_RTL=1
@ -1133,6 +1136,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-freebsd)
REQUIRE_PACKAGES_RTL=1
@ -1142,6 +1146,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1
@ -1151,6 +1156,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1
@ -1160,6 +1166,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-solaris)
REQUIRE_PACKAGES_RTL=1
@ -1169,6 +1176,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-qnx)
REQUIRE_PACKAGES_RTL=1
@ -1178,6 +1186,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-netware)
REQUIRE_PACKAGES_RTL=1
@ -1187,6 +1196,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-openbsd)
REQUIRE_PACKAGES_RTL=1
@ -1196,6 +1206,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-wdosx)
REQUIRE_PACKAGES_RTL=1
@ -1205,6 +1216,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-darwin)
REQUIRE_PACKAGES_RTL=1
@ -1214,6 +1226,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-emx)
REQUIRE_PACKAGES_RTL=1
@ -1223,6 +1236,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-watcom)
REQUIRE_PACKAGES_RTL=1
@ -1232,6 +1246,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
REQUIRE_PACKAGES_RTL=1
@ -1241,6 +1256,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),i386-wince)
REQUIRE_PACKAGES_RTL=1
@ -1250,6 +1266,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1
@ -1259,6 +1276,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
REQUIRE_PACKAGES_RTL=1
@ -1268,6 +1286,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
REQUIRE_PACKAGES_RTL=1
@ -1277,6 +1296,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),m68k-amiga)
REQUIRE_PACKAGES_RTL=1
@ -1286,6 +1306,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),m68k-atari)
REQUIRE_PACKAGES_RTL=1
@ -1295,6 +1316,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
REQUIRE_PACKAGES_RTL=1
@ -1304,6 +1326,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),m68k-palmos)
REQUIRE_PACKAGES_RTL=1
@ -1313,6 +1336,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),powerpc-linux)
REQUIRE_PACKAGES_RTL=1
@ -1322,6 +1346,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
REQUIRE_PACKAGES_RTL=1
@ -1331,6 +1356,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
REQUIRE_PACKAGES_RTL=1
@ -1340,6 +1366,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),powerpc-macos)
REQUIRE_PACKAGES_RTL=1
@ -1349,6 +1376,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
REQUIRE_PACKAGES_RTL=1
@ -1358,6 +1386,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
REQUIRE_PACKAGES_RTL=1
@ -1367,6 +1396,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1
@ -1376,6 +1406,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
REQUIRE_PACKAGES_RTL=1
@ -1385,6 +1416,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),sparc-solaris)
REQUIRE_PACKAGES_RTL=1
@ -1394,6 +1426,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),x86_64-linux)
REQUIRE_PACKAGES_RTL=1
@ -1403,6 +1436,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
REQUIRE_PACKAGES_RTL=1
@ -1412,6 +1446,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
REQUIRE_PACKAGES_RTL=1
@ -1421,6 +1456,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),arm-linux)
REQUIRE_PACKAGES_RTL=1
@ -1430,6 +1466,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),arm-palmos)
REQUIRE_PACKAGES_RTL=1
@ -1439,6 +1476,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_RTL=1
@ -1448,6 +1486,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),arm-gba)
REQUIRE_PACKAGES_RTL=1
@ -1457,6 +1496,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
REQUIRE_PACKAGES_RTL=1
@ -1466,6 +1506,7 @@ REQUIRE_PACKAGES_OGGVORBIS=1
REQUIRE_PACKAGES_A52=1
REQUIRE_PACKAGES_DTS=1
REQUIRE_PACKAGES_MODPLUG=1
REQUIRE_PACKAGES_MATROSKA=1
endif
ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@ -1649,6 +1690,32 @@ ifdef UNITDIR_MODPLUG
override COMPILER_UNITDIR+=$(UNITDIR_MODPLUG)
endif
endif
ifdef REQUIRE_PACKAGES_MATROSKA
PACKAGEDIR_MATROSKA:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /matroska/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_MATROSKA),)
ifneq ($(wildcard $(PACKAGEDIR_MATROSKA)/units/$(TARGETSUFFIX)),)
UNITDIR_MATROSKA=$(PACKAGEDIR_MATROSKA)/units/$(TARGETSUFFIX)
else
UNITDIR_MATROSKA=$(PACKAGEDIR_MATROSKA)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_MATROSKA)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_MATROSKA) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_MATROSKA)/$(FPCMADE)
endif
else
PACKAGEDIR_MATROSKA=
UNITDIR_MATROSKA:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /matroska/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_MATROSKA),)
UNITDIR_MATROSKA:=$(firstword $(UNITDIR_MATROSKA))
else
UNITDIR_MATROSKA=
endif
endif
ifdef UNITDIR_MATROSKA
override COMPILER_UNITDIR+=$(UNITDIR_MATROSKA)
endif
endif
ifndef NOCPUDEF
override FPCOPTDEF=$(CPU_TARGET)
endif

View File

@ -6,7 +6,7 @@
programs=madopenal
[require]
packages=openal mad oggvorbis a52 dts modplug
packages=openal mad oggvorbis a52 dts modplug matroska
[install]
fpcpackage=y