Browse Source

Set RTLCONSTSUNIT to rtlconst only of FPC_DOTTEDUNITS is not defined

Pierre Muller 2 years ago
parent
commit
9d52550178
4 changed files with 8 additions and 1 deletions
  1. 2 0
      rtl/beos/Makefile.fpc
  2. 2 0
      rtl/netware/Makefile.fpc
  3. 2 1
      rtl/symbian/Makefile.fpc
  4. 2 0
      rtl/watcom/Makefile.fpc

+ 2 - 0
rtl/beos/Makefile.fpc

@@ -60,7 +60,9 @@ UNIXINC=$(RTL)/unix
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
 BASEUNIXDIR=.
 BASEUNIXDIR=.
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
 RTLCONSTSUNIT=rtlconst
+endif
 # Use new feature from 1.0.5 version
 # Use new feature from 1.0.5 version
 # that generates release PPU files
 # that generates release PPU files
 # which will not be recompiled
 # which will not be recompiled

+ 2 - 0
rtl/netware/Makefile.fpc

@@ -48,7 +48,9 @@ PROCINC=$(RTL)/$(CPU_TARGET)
 
 
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
 RTLCONSTSUNIT=rtlconst
+endif
 DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT)
 DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
 
 

+ 2 - 1
rtl/symbian/Makefile.fpc

@@ -31,7 +31,6 @@ sourcedir=$(INC) $(PROCINC) $(COMMON)
 [prerules]
 [prerules]
 RTL=..
 RTL=..
 INC=$(RTL)/inc
 INC=$(RTL)/inc
-UNIXINC=$(RTL)/unix
 COMMON=$(RTL)/common
 COMMON=$(RTL)/common
 PROCINC=$(RTL)/$(CPU_TARGET)
 PROCINC=$(RTL)/$(CPU_TARGET)
 SYMBIANINC=./symbianinc
 SYMBIANINC=./symbianinc
@@ -39,7 +38,9 @@ UIQINC=./uiqinc
 
 
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
 RTLCONSTSUNIT=rtlconst
+endif
 
 
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas
 
 

+ 2 - 0
rtl/watcom/Makefile.fpc

@@ -53,7 +53,9 @@ PROCINC=../$(CPU_TARGET)
 
 
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
 RTLCONSTSUNIT=rtlconst
+endif
 DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT)
 DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)