Pārlūkot izejas kodu

Add rule to generate exitcode.exe dos/go32v2 binary, required by dosbox_wrapper

Pierre Muller 1 gadu atpakaļ
vecāks
revīzija
f4a413fabd

+ 12 - 1
tests/tstunits/Makefile

@@ -2329,7 +2329,18 @@ ctest:
 	@$(ECHO) "No C compiler found"
 	@exit 1
 endif
-extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT)
+ifneq ($(findstring dosbox_wrapper,$(EMULATOR)),)
+  MSDOS_EXITCODE_SRC=../utils/dosbox/exitcode.pas
+  MSDOS_EXITCODE_PROG=../utils/dosbox/exitcode.exe
+else
+  MSDOS_EXITCODE_SRC=
+  MSDOS_EXITCODE_PROG=
+endif
+ifdef MSDOS_EXITCODE_PROG
+$(MSDOS_EXITCODE_PROG): $(MSDOS_EXITCODE_SRC)
+	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) -o$(MSDOS_EXITCODE_PROG) $(MSDOS_EXITCODE_SRC)
+endif
+extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT) $(MSDOS_EXITCODE_PROG)
 PPULIST:=$(wildcard */*.ppu) $(wildcard units/*/*.ppu)
 PPULOGLIST:=$(subst .ppu,.log-ppu,$(PPULIST))
 RMPPULOGLIST:=$(subst .ppu,.rm-log-ppu,$(PPULIST))

+ 13 - 1
tests/tstunits/Makefile.fpc

@@ -163,8 +163,20 @@ ctest:
         @exit 1
 endif
 
+ifneq ($(findstring dosbox_wrapper,$(EMULATOR)),)
+  MSDOS_EXITCODE_SRC=../utils/dosbox/exitcode.pas
+  MSDOS_EXITCODE_PROG=../utils/dosbox/exitcode.exe
+else
+  MSDOS_EXITCODE_SRC=
+  MSDOS_EXITCODE_PROG=
+endif
+
+ifdef MSDOS_EXITCODE_PROG
+$(MSDOS_EXITCODE_PROG): $(MSDOS_EXITCODE_SRC)
+	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) -o$(MSDOS_EXITCODE_PROG) $(MSDOS_EXITCODE_SRC)
+endif
 
-extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT)
+extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT) $(MSDOS_EXITCODE_PROG)
 
 
 #####################################################################

+ 5 - 0
tests/tstunits/go32v2/Package.fpc

@@ -0,0 +1,5 @@
+[package]
+name=rtl
+version=3.3.1
+[require]
+packages_go32v2_i386=