Browse Source

embedded dos unit needs objpas unit because of objfpc mode

Pierre Muller 2 years ago
parent
commit
2836bf406d
2 changed files with 5 additions and 0 deletions
  1. 1 0
      rtl/embedded/Makefile
  2. 4 0
      rtl/embedded/Makefile.fpc

+ 1 - 0
rtl/embedded/Makefile

@@ -893,6 +893,7 @@ CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \
 			  $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
 			  $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
 SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
 DOSDIR=.
 DOSDIR=.
+DOS_DEPS_OS=objpas$(PPUEXT)
 ifeq ($(ARCH),aarch64)
 ifeq ($(ARCH),aarch64)
 CPU_UNITS=$(RASPI3UNIT) $(MMIOUNIT) $(MAILBOXUNIT) $(RASPIUARTUNIT) $(GPIOUNIT)
 CPU_UNITS=$(RASPI3UNIT) $(MMIOUNIT) $(MAILBOXUNIT) $(RASPIUARTUNIT) $(GPIOUNIT)
 CPU_UNITS_DEFINED=1
 CPU_UNITS_DEFINED=1

+ 4 - 0
rtl/embedded/Makefile.fpc

@@ -66,8 +66,12 @@ CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \
 			  $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) \
 			  $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) \
 			  $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
 			  $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
 
 
+# Sysutils special deps
 SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
+# Dos unit, local source
 DOSDIR=.
 DOSDIR=.
+# Dos unit uses objfpc mode
+DOS_DEPS_OS=objpas$(PPUEXT)
 
 
 ifeq ($(ARCH),aarch64)
 ifeq ($(ARCH),aarch64)
 CPU_UNITS=$(RASPI3UNIT) $(MMIOUNIT) $(MAILBOXUNIT) $(RASPIUARTUNIT) $(GPIOUNIT)
 CPU_UNITS=$(RASPI3UNIT) $(MMIOUNIT) $(MAILBOXUNIT) $(RASPIUARTUNIT) $(GPIOUNIT)