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

Unique rule for fpwidestring unit

Browse Source
This commit is contained in:
Pierre Muller 2023-08-04 22:54:11 +00:00
parent eac6add9f7
commit bc40d13c4a
13 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtl/aix/Makefile.fpc
View File

@ -256,9 +256,6 @@ iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp $(COMPILER) $(INC)/extpas.pp
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
# #
# Other system-dependent RTL Units # Other system-dependent RTL Units
# #

2
rtl/android/Makefile.fpc
View File

@ -270,8 +270,6 @@ extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
fpintres$(PPUEXT) : $(INC)/fpintres.pp $(SYSTEMUNIT)$(PPUEXT) fpintres$(PPUEXT) : $(INC)/fpintres.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/fpintres.pp $(COMPILER) $(INC)/fpintres.pp
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
# #
# Other $(SYSTEMUNIT)-dependent RTL Units # Other $(SYSTEMUNIT)-dependent RTL Units
# #

3
rtl/dragonfly/Makefile.fpc
View File

@ -251,9 +251,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas $(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 # Other system-dependent RTL Units
# #

2
rtl/freebsd/Makefile.fpc
View File

@ -277,8 +277,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas $(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 # Other system-dependent RTL Units
# #

3
rtl/go32v2/Makefile.fpc
View File

@ -232,9 +232,6 @@ ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(INC)/ucomplex.pp $(COMPILER) $(INC)/ucomplex.pp
$(EXECPPAS) $(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) character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) objpas$(PPUEXT) rtlconst$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas $(COMPILER) $(OBJPASDIR)/character.pas

16
rtl/inc/Makefile.rtl
View File

@ -1235,8 +1235,20 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
# fpwidestring # fpwidestring
# #
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \ ifneq ($(UNIXINC),)
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ 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) \ $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
$(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU) $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)

3
rtl/msxdos/Makefile.fpc
View File

@ -196,9 +196,6 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
$(EXECPPAS) $(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) character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) objpas$(PPUEXT) rtlconsts$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas $(COMPILER) $(OBJPASDIR)/character.pas

3
rtl/netbsd/Makefile.fpc
View File

@ -286,9 +286,6 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<
fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp
# #
# Other system-dependent RTL Units # Other system-dependent RTL Units
# #

3
rtl/openbsd/Makefile.fpc
View File

@ -313,9 +313,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas $(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) bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<

3
rtl/solaris/Makefile.fpc
View File

@ -249,9 +249,6 @@ charset$(PPUEXT) : $(INC)/charset.pp objpas$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas $(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) iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/iso7185.pp $(COMPILER) $(INC)/iso7185.pp

1
rtl/win32/Makefile.fpc
View File

@ -74,6 +74,7 @@ WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
EXTPAS_DEPS_OS=buildrtl$(PPUEXT) EXTPAS_DEPS_OS=buildrtl$(PPUEXT)
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
[rules] [rules]
.NOTPARALLEL: .NOTPARALLEL:

1
rtl/win64/Makefile.fpc
View File

@ -89,6 +89,7 @@ OBJPASDIR=$(RTL)/objpas
WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
FPC_SYSTEM_OPT=-Fi../win FPC_SYSTEM_OPT=-Fi../win
EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
[rules] [rules]
.NOTPARALLEL: .NOTPARALLEL:

1
rtl/wince/Makefile.fpc
View File

@ -86,6 +86,7 @@ DOS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
SYSUTILSDIR=. SYSUTILSDIR=.
SYSUTILS_OPT=-Fi../win SYSUTILS_OPT=-Fi../win
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
[rules] [rules]
.NOTPARALLEL: .NOTPARALLEL: