* paszlib is needed for zstream

git-svn-id: trunk@8939 -
This commit is contained in:
peter 2007-10-25 20:34:45 +00:00
parent 71c314c550
commit 9fbaaa3557
2 changed files with 19 additions and 5 deletions

View File

@ -1,11 +1,12 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/08/22] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/25]
# #
default: all 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 i386-embedded i386-symbian 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded 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 i386-embedded i386-symbian 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
OSNeedsComspecToRunBatch = go32v2 watcom
FORCE: FORCE:
.PHONY: FORCE .PHONY: FORCE
override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@ -56,6 +57,11 @@ else
SRCBATCHEXT=.bat SRCBATCHEXT=.bat
endif endif
endif endif
ifdef COMSPEC
ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
RUNBATCH=$(COMSPEC) /C
endif
endif
ifdef inUnix ifdef inUnix
PATHSEP=/ PATHSEP=/
else else
@ -102,7 +108,7 @@ ifndef FPC
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
ifneq ($(FPCPROG),) ifneq ($(FPCPROG),)
FPCPROG:=$(firstword $(FPCPROG)) FPCPROG:=$(firstword $(FPCPROG))
FPC:=$(shell $(FPCPROG) -PB) FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
ifneq ($(findstring Error,$(FPC)),) ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
endif endif
@ -1760,7 +1766,7 @@ else
TAROPT=vz TAROPT=vz
TAREXT=.tar.gz TAREXT=.tar.gz
endif endif
override REQUIRE_PACKAGES=rtl pasjpeg fcl-base override REQUIRE_PACKAGES=rtl pasjpeg paszlib fcl-base
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
@ -2443,7 +2449,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
endif endif
ifndef CROSSBOOTSTRAP ifndef CROSSBOOTSTRAP
ifneq ($(BINUTILSPREFIX),) ifneq ($(BINUTILSPREFIX),)
override FPCOPT+=-XP$(BINUTILSPREFIX) override FPCOPT+=-XP$(BINUTILSPREFIX)
endif endif
ifneq ($(BINUTILSPREFIX),) ifneq ($(BINUTILSPREFIX),)
override FPCOPT+=-Xr$(RLINKPATH) override FPCOPT+=-Xr$(RLINKPATH)
@ -2575,9 +2581,13 @@ ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS= EXECPPAS=
else else
ifeq ($(FULL_SOURCE),$(FULL_TARGET)) ifeq ($(FULL_SOURCE),$(FULL_TARGET))
ifdef RUNBATCH
EXECPPAS:=@$(RUNBATCH) $(PPAS)
else
EXECPPAS:=@$(PPAS) EXECPPAS:=@$(PPAS)
endif endif
endif endif
endif
.PHONY: fpc_units .PHONY: fpc_units
ifneq ($(TARGET_UNITS),) ifneq ($(TARGET_UNITS),)
override ALLTARGET+=fpc_units override ALLTARGET+=fpc_units
@ -2819,8 +2829,12 @@ else
endif endif
ifdef inUnix ifdef inUnix
/bin/sh $(ZIPWRAPPER) /bin/sh $(ZIPWRAPPER)
else
ifdef RUNBATCH
$(RUNBATCH) (ZIPWRAPPER)
else else
$(ZIPWRAPPER) $(ZIPWRAPPER)
endif
endif endif
$(DEL) $(ZIPWRAPPER) $(DEL) $(ZIPWRAPPER)
else else

View File

@ -21,7 +21,7 @@ rsts=pscanvas
examples=imgconv examples=imgconv
[require] [require]
packages=pasjpeg fcl-base packages=pasjpeg paszlib fcl-base
[compiler] [compiler]
options=-S2h options=-S2h