mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-22 08:09:29 +02:00
+ Patch from Vincent Snijders to fix Win32 install
This commit is contained in:
parent
3995a8bba2
commit
3894df62ff
@ -215,14 +215,20 @@ endif
|
||||
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
|
||||
override PACKAGE_NAME=fcl
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
ifneq ($(OS_TARGET),win32)
|
||||
INSTALL_UNITS+=Dbf_Wtil
|
||||
CLEAN_UNITS+=Dbf_Wtil
|
||||
endif
|
||||
endif
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
override TARGET_UNITS+=Dbf
|
||||
endif
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
override TARGET_EXAMPLES+=testdbf
|
||||
endif
|
||||
override CLEAN_UNITS+=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str Dbf_Wtil
|
||||
override CLEAN_UNITS+=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
override INSTALL_UNITS+=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str Dbf_Wtil
|
||||
override INSTALL_UNITS+=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str
|
||||
endif
|
||||
override INSTALL_FPCPACKAGE=y
|
||||
override COMPILER_OPTIONS+=-S2 -Sh
|
||||
|
@ -13,16 +13,26 @@ examples_i386=testdbf
|
||||
options=-S2 -Sh
|
||||
targetdir=../../$(OS_TARGET)
|
||||
|
||||
[default]
|
||||
fpcdir=../../..
|
||||
|
||||
[install]
|
||||
fpcpackage=y
|
||||
units_i386=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur \
|
||||
Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile \
|
||||
Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str Dbf_Wtil
|
||||
|
||||
[default]
|
||||
fpcdir=../../..
|
||||
Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str
|
||||
|
||||
[clean]
|
||||
units=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur \
|
||||
Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile \
|
||||
Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str Dbf_Wtil
|
||||
Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str
|
||||
|
||||
[prerules]
|
||||
# Dbf_Wtil is needed on all targets except win32
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
ifneq ($(OS_TARGET),win32)
|
||||
INSTALL_UNITS+=Dbf_Wtil
|
||||
CLEAN_UNITS+=Dbf_Wtil
|
||||
endif
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user