Browse Source

Rectofy emx/os2 unit dependencies

Pierre Muller 2 years ago
parent
commit
9acc01cc93
2 changed files with 12 additions and 3 deletions
  1. 6 3
      rtl/emx/Makefile.fpc
  2. 6 0
      rtl/os2/Makefile.fpc

+ 6 - 3
rtl/emx/Makefile.fpc

@@ -47,15 +47,18 @@ sourcedir=$(INC) $(PROCINC) $(OS2INC)
 RTL=..
 INC=$(RTL)/inc
 PROCINC=$(RTL)/$(CPU_TARGET)
+OS2INC=$(RTL)/os2
 OS2DIR=$(RTL)/os2
-DOS_DEPS_OS=doscalls$(PPUEXT) 
-SYSUTILS_DEPS_OS=dos$(PPUEXT)
-DYNLIBS_DEPS_OD=doscalls($PPUEXT)
+DOS_DEPS_OS=$(DOSCALLSUNIT)$(PPUEXT)
+SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+DYNLIBS_DEPS_OS=$(DOSCALLSUNIT)$(PPUEXT)
 
 UNITPREFIX=rtl
 
 SYSTEMUNIT=system
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
+endif
 
 # Use new feature from 1.0.5 version
 # that generates release PPU files

+ 6 - 0
rtl/os2/Makefile.fpc

@@ -51,10 +51,16 @@ SYSTEMUNITEXT=pas
 DOSUNITEXT=pas
 PORTSUNITEXT=pas
 UNITPREFIX=rtl
+DOS_DEPS_OS=$(DOSCALLSUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(DOSCALLSUNIT)$(PPUEXT)
+DYNLIBS_DEPS_OS=$(DOSCALLSUNIT)$(PPUEXT)
+
+
 
 SYSTEMUNIT=system
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
+endif
 
 # Use new feature from 1.0.5 version
 # that generates release PPU files