Made test Makefiles work with CMD.EXE

[cc65] / test / misc / Makefile

diff --git a/test/misc/Makefile b/test/misc/Makefile
index b04321c337ce17b99237fc04a4a0c2786642b54d..a1b1d72ca6e2fe9051c819c2b4246bf7d58896e3 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -5,20 +5,23 @@ ifneq ($(shell echo),)
   CMD_EXE := 1
 endif
 
-CC65FLAGS := -t sim6502
-SIM65FLAGS := -x 200000000
-
-CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
-SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
-
 ifdef CMD_EXE
-RM := del /f
+  S := $(subst /,\,/)
+  NOT := - # Hack
+  RM = del /f $(subst /,\,$1)
 else
-RM := rm -f
+  S := /
+  NOT := !
+  RM = $(RM) $1
 endif
 
-WORKDIR := ../../testwrk
+CC65FLAGS := -t sim6502
+SIM65FLAGS := -x 200000000
+
+CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
+SIM65 := $(if $(wildcard ../../bin/sim65*),..$S..$Sbin$Ssim65,sim65)
 
+WORKDIR := ..$S..$Stestwrk
 DIFF := $(WORKDIR)/bdiff
 
 .PHONY: all clean
@@ -31,7 +34,7 @@ all: $(TESTS)
 # should compile, but then hangs in an endless loop
 $(WORKDIR)/endless%prg: endless.c
        $(CL65) $(subst .,,$(*:.o%=-O%)) $(CC65FLAGS) $< -o $@
-       ! $(SIM65) $(SIM65FLAGS) $@
+       $(NOT) $(SIM65) $(SIM65FLAGS) $@
 
 # these need reference data that can't be generated by a host-compiled program,
 # in a useful way
@@ -51,6 +54,6 @@ $(WORKDIR)/sitest%prg: sitest.c
 #      -$(SIM65) $(SIM65FLAGS) $@
 
 clean:
-       @$(RM) $(TESTS)
-       @$(RM) $(SOURCES:.c=.o)
-       @$(RM) $(SOURCES:%.c=$(WORKDIR)/%.out)
+       -@$(call RM,$(TESTS))
+       -@$(call RM,$(SOURCES:.c=.o))
+       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.out))