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

Set special value for RTLDEFSINCDIR variable

Browse Source 
for andrioid and targets using AMIINC variable.
  Add rtldefs.inc dependency for cwstring unit,
with RTLDEFSINCDIR directory.
This commit is contained in:
Pierre Muller 2023-09-25 21:40:52 +02:00
parent 2f8c0c091c
commit 48ea716826
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtl/inc/Makefile.rtl
View File

@ -1292,10 +1292,14 @@ endif
# TODO: fpwidestring unit also includes rtldefs.inc
# but this can be in different directories
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
@ -1476,7 +1480,7 @@ UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
#
# CWString
#
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \