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

+ Patch from Vincent Snijders to fix Win32 install

Browse Source
This commit is contained in:
michael 2004-08-08 17:03:59 +00:00
parent 3995a8bba2
commit 3894df62ff
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fcl/db/dbase/Makefile
View File

@ -215,14 +215,20 @@ endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override PACKAGE_NAME=fcl override PACKAGE_NAME=fcl
ifeq ($(CPU_TARGET),i386) 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 override TARGET_UNITS+=Dbf
endif endif
ifeq ($(CPU_TARGET),i386) ifeq ($(CPU_TARGET),i386)
override TARGET_EXAMPLES+=testdbf override TARGET_EXAMPLES+=testdbf
endif 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) 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 endif
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
override COMPILER_OPTIONS+=-S2 -Sh override COMPILER_OPTIONS+=-S2 -Sh

20
fcl/db/dbase/Makefile.fpc
View File

@ -13,16 +13,26 @@ examples_i386=testdbf
options=-S2 -Sh options=-S2 -Sh
targetdir=../../$(OS_TARGET) targetdir=../../$(OS_TARGET)
[default]
fpcdir=../../..
[install] [install]
fpcpackage=y fpcpackage=y
units_i386=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur \ units_i386=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur \
Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile \ 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
[default]
fpcdir=../../..
[clean] [clean]
units=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur \ units=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur \
Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile \ 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