paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 15:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Added dependency on winunits

Browse Source 
git-svn-id: trunk@6291 -
This commit is contained in:
michael 2007-02-02 08:19:57 +00:00
parent e5363182ad
commit 93b4f7e960
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fcl/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/13]
# #
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 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 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
@ -2019,6 +2019,7 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_WINUNITS=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1 REQUIRE_PACKAGES_POSTGRES=1
@ -2377,6 +2378,7 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_WINUNITS=1
REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_PASJPEG=1
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
@ -2771,6 +2773,32 @@ ifdef UNITDIR_SQLITE
override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) override COMPILER_UNITDIR+=$(UNITDIR_SQLITE)
endif endif
endif endif
ifdef REQUIRE_PACKAGES_WINUNITS
PACKAGEDIR_WINUNITS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_WINUNITS),)
ifneq ($(wildcard $(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)),)
UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)
else
UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_WINUNITS)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_WINUNITS) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS)/$(FPCMADE)
endif
else
PACKAGEDIR_WINUNITS=
UNITDIR_WINUNITS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_WINUNITS),)
UNITDIR_WINUNITS:=$(firstword $(UNITDIR_WINUNITS))
else
UNITDIR_WINUNITS=
endif
endif
ifdef UNITDIR_WINUNITS
override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS)
endif
endif
ifndef NOCPUDEF ifndef NOCPUDEF
override FPCOPTDEF=$(CPU_TARGET) override FPCOPTDEF=$(CPU_TARGET)
endif endif
@ -2822,7 +2850,7 @@ ifeq ($(CPU_TARGET),powerpc)
FPCCPUOPT:=-O1r FPCCPUOPT:=-O1r
endif endif
else else
FPCCPUOPT:=-O1r FPCCPUOPT:=-O2
endif endif
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE override FPCOPTDEF+=RELEASE

4
fcl/Makefile.fpc
View File

@ -14,8 +14,8 @@ packages_darwin=netdb libasync pthreads
packages_solaris=netdb libasync pthreads packages_solaris=netdb libasync pthreads
packages_netbsd=netdb libasync packages_netbsd=netdb libasync
packages_openbsd=netdb libasync packages_openbsd=netdb libasync
packages_win32=netdb packages_win32=netdb winunits
packages_win64=netdb packages_win64=netdb winunits
packages_wince=netdb packages_wince=netdb
packages_os2=netdb packages_os2=netdb
packages_emx=netdb packages_emx=netdb