paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-04 09:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

* unified check for win32, win64

Browse Source 
git-svn-id: trunk@9680 -
This commit is contained in:
peter 2008-01-08 18:24:00 +00:00
parent aae917590c
commit c2d5f7028d
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/12/01]
#
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-darwin 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
@ -3320,14 +3320,7 @@ extra_debug: base_debug fcl-xml_debug
extra_smart: base_smart fcl-xml_smart
extra_release: base_release fcl-xml_release
extra_shared: base_shared fcl-xml_shared
ifeq ($(OS_TARGET),win32)
fcl-base_all: base_all winunits-base_all winunits-jedi_all
fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
fcl-base_release: base_release winunits-base_release winunits-jedi_release
fcl-base_shared: base_shared winunits-base_shared winunits-jedi_shared
else
ifeq ($(OS_TARGET),win64)
ifeq ($(findstring $(OS_TARGET),win32 win64),)
fcl-base_all: base_all winunits-base_all winunits-jedi_all
fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
@ -3340,7 +3333,6 @@ fcl-base_smart: base_smart
fcl-base_release: base_release
fcl-base_shared: base_shared
endif
endif
fcl-xml_all: fcl-base_all
fcl-xml_debug: fcl-base_debug
fcl-xml_smart: fcl-base_smart

11
packages/Makefile.fpc
View File

@ -34,14 +34,8 @@ extra_smart: base_smart fcl-xml_smart
extra_release: base_release fcl-xml_release
extra_shared: base_shared fcl-xml_shared
ifeq ($(OS_TARGET),win32)
fcl-base_all: base_all winunits-base_all winunits-jedi_all
fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
fcl-base_release: base_release winunits-base_release winunits-jedi_release
fcl-base_shared: base_shared winunits-base_shared winunits-jedi_shared
else
ifeq ($(OS_TARGET),win64)
ifeq ($(findstring $(OS_TARGET),win32 win64),)
fcl-base_all: base_all winunits-base_all winunits-jedi_all
fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
@ -54,7 +48,6 @@ fcl-base_smart: base_smart
fcl-base_release: base_release
fcl-base_shared: base_shared
endif
endif
fcl-xml_all: fcl-base_all
fcl-xml_debug: fcl-base_debug