mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-08 04:48:07 +02:00
Unique rule for fpwidestring unit
This commit is contained in:
parent
eac6add9f7
commit
bc40d13c4a
@ -256,9 +256,6 @@ iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $(INC)/extpas.pp
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
|
||||
|
||||
#
|
||||
# Other system-dependent RTL Units
|
||||
#
|
||||
|
@ -270,8 +270,6 @@ extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||
fpintres$(PPUEXT) : $(INC)/fpintres.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $(INC)/fpintres.pp
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
|
||||
#
|
||||
# Other $(SYSTEMUNIT)-dependent RTL Units
|
||||
#
|
||||
|
@ -251,9 +251,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
|
||||
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
|
||||
|
||||
#
|
||||
# Other system-dependent RTL Units
|
||||
#
|
||||
|
@ -277,8 +277,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
|
||||
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
|
||||
#
|
||||
# Other system-dependent RTL Units
|
||||
#
|
||||
|
@ -232,9 +232,6 @@ ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT)
|
||||
$(COMPILER) $(INC)/ucomplex.pp
|
||||
$(EXECPPAS)
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp charset$(PPUEXT) system$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
|
||||
|
||||
character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) objpas$(PPUEXT) rtlconst$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/character.pas
|
||||
|
||||
|
@ -1235,8 +1235,20 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
|
||||
# fpwidestring
|
||||
#
|
||||
|
||||
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
|
||||
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
|
||||
ifneq ($(UNIXINC),)
|
||||
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
|
||||
endif
|
||||
|
||||
# TODO: fpwidestring unit also includes rtldefs.inc
|
||||
# but this can be in different directories
|
||||
ifeq ($(AMIINC),)
|
||||
RTLDEFSINCDIR = $(OSDIR)
|
||||
else
|
||||
RTLDEFSINCDIR=$(AMIINC)
|
||||
endif
|
||||
|
||||
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
|
||||
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
|
||||
$(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
|
||||
$(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
|
||||
|
||||
|
@ -196,9 +196,6 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
|
||||
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
|
||||
$(EXECPPAS)
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp unicodedata$(PPUEXT) charset$(PPUEXT) objpas$(PPUEXT) system$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
|
||||
|
||||
character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) objpas$(PPUEXT) rtlconsts$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/character.pas
|
||||
|
||||
|
@ -286,9 +286,6 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
|
||||
fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $<
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
|
||||
|
||||
#
|
||||
# Other system-dependent RTL Units
|
||||
#
|
||||
|
@ -313,9 +313,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
|
||||
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
|
||||
$(COMPILER) $<
|
||||
|
||||
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $<
|
||||
|
||||
|
@ -249,9 +249,6 @@ charset$(PPUEXT) : $(INC)/charset.pp objpas$(PPUEXT)
|
||||
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
|
||||
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
|
||||
|
||||
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
|
||||
|
||||
iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $(INC)/iso7185.pp
|
||||
|
||||
|
@ -74,6 +74,7 @@ WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
|
||||
|
||||
EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
EXTPAS_DEPS_OS=buildrtl$(PPUEXT)
|
||||
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
|
@ -89,6 +89,7 @@ OBJPASDIR=$(RTL)/objpas
|
||||
WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
|
||||
FPC_SYSTEM_OPT=-Fi../win
|
||||
EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
|
@ -86,6 +86,7 @@ DOS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
SYSUTILSDIR=.
|
||||
SYSUTILS_OPT=-Fi../win
|
||||
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
|
Loading…
Reference in New Issue
Block a user