Browse Source

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: branches/fixes_3_0@36152 -

pierre 8 years ago
parent
commit
063793363f
2 changed files with 14 additions and 1 deletions
  1. 2 0
      tests/utils/Makefile
  2. 12 1
      tests/utils/Makefile.fpc

+ 2 - 0
tests/utils/Makefile

@@ -2043,5 +2043,7 @@ include fpcmake.loc
 endif
 endif
 .NOTPARALLEL:
 .NOTPARALLEL:
 utils: all
 utils: all
+dosbox_wrapper$(SRCEXEEXT): dosbox/dosbox_wrapper.pas  
+	$(COMPILER) -FE./dosbox $<
 utilsdb:
 utilsdb:
 	$(MAKE) utils DBDIGEST="dbdigest dbconfig"
 	$(MAKE) utils DBDIGEST="dbdigest dbconfig"

+ 12 - 1
tests/utils/Makefile.fpc

@@ -13,7 +13,7 @@ fpcdir=../..
 nortl=y
 nortl=y
 
 
 [target]
 [target]
-programs=dotest fptime fail testfail digest concat $(DBDIGEST)
+programs=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
 programs_win32=prepup
 programs_win32=prepup
 programs_win64=prepup
 programs_win64=prepup
 programs_go32v2=prepup
 programs_go32v2=prepup
@@ -21,10 +21,21 @@ programs_go32v2=prepup
 [clean]
 [clean]
 programs=dbdigest dbconfig
 programs=dbdigest dbconfig
 
 
+[prerules]
+
+ifneq ($(findstring dosbox_wrapper,$(EMULATOR)),)
+  MSDOSPROG=dosbox/dosbox_wrapper$(SRCEXEEXT)
+else
+  MSDOSPROG=
+endif
+
 [rules]
 [rules]
 .NOTPARALLEL:
 .NOTPARALLEL:
 
 
 utils: all
 utils: all
 
 
+dosbox/dosbox_wrapper$(SRCEXEEXT): dosbox/dosbox_wrapper.pas  
+	$(COMPILER) -FE./dosbox $<
+
 utilsdb:
 utilsdb:
         $(MAKE) utils DBDIGEST="dbdigest dbconfig"
         $(MAKE) utils DBDIGEST="dbdigest dbconfig"