From b1b6412a4118f5ceacd9178902d3b1f0da41bbb3 Mon Sep 17 00:00:00 2001
From: pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2>
Date: Sun, 7 May 2017 22:13:21 +0000
Subject: Fix dosbox_wrapper executable location from commits 32614,32625,6256
 and 32628
 ------------------------------------------------------------------------
 r32614 | pierre | 2015-12-07 23:54:02 +0100 (Mon, 07 Dec 2015) | 1 line

 Add explicit rule to compile dosbox_wrapper, executable is put in utils/dosbox directory
------------------------------------------------------------------------
------------------------------------------------------------------------
r32625 | pierre | 2015-12-10 02:51:15 +0100 (Thu, 10 Dec 2015) | 1 line

 Add dosbox/dosbox_wrapper to list of programs if EMULATOR variable contains dosbox_wrapper string pattern
------------------------------------------------------------------------
r32626 | pierre | 2015-12-10 02:51:37 +0100 (Thu, 10 Dec 2015) | 1 line

Regenerate after: Add dosbox/dosbox_wrapper to list of programs if EMULATOR variable contains dosbox_wrapper string pattern
------------------------------------------------------------------------


git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36152 3ad0048d-3df7-0310-abae-a5850022a9f2
---
 tests/utils/Makefile     |  2 ++
 tests/utils/Makefile.fpc | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/tests/utils/Makefile b/tests/utils/Makefile
index 624492458f..ce7c6b5f66 100644
--- a/tests/utils/Makefile
+++ b/tests/utils/Makefile
@@ -2043,5 +2043,7 @@ include fpcmake.loc
 endif
 .NOTPARALLEL:
 utils: all
+dosbox_wrapper$(SRCEXEEXT): dosbox/dosbox_wrapper.pas  
+	$(COMPILER) -FE./dosbox $<
 utilsdb:
 	$(MAKE) utils DBDIGEST="dbdigest dbconfig"
diff --git a/tests/utils/Makefile.fpc b/tests/utils/Makefile.fpc
index a82290afc5..89d39c7523 100644
--- a/tests/utils/Makefile.fpc
+++ b/tests/utils/Makefile.fpc
@@ -13,7 +13,7 @@ fpcdir=../..
 nortl=y
 
 [target]
-programs=dotest fptime fail testfail digest concat $(DBDIGEST)
+programs=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
 programs_win32=prepup
 programs_win64=prepup
 programs_go32v2=prepup
@@ -21,10 +21,21 @@ programs_go32v2=prepup
 [clean]
 programs=dbdigest dbconfig
 
+[prerules]
+
+ifneq ($(findstring dosbox_wrapper,$(EMULATOR)),)
+  MSDOSPROG=dosbox/dosbox_wrapper$(SRCEXEEXT)
+else
+  MSDOSPROG=
+endif
+
 [rules]
 .NOTPARALLEL:
 
 utils: all
 
+dosbox/dosbox_wrapper$(SRCEXEEXT): dosbox/dosbox_wrapper.pas  
+	$(COMPILER) -FE./dosbox $<
+
 utilsdb:
         $(MAKE) utils DBDIGEST="dbdigest dbconfig"
-- 
cgit v1.2.1