From fcc864256fbd539bd547876e342d532022bdb0d5 Mon Sep 17 00:00:00 2001 From: George Tasker Date: Tue, 16 Jan 2001 10:57:48 +0000 Subject: [PATCH] Added code to create $D (debug or release) subdir to put the .OBJ files into. Changed code to use the RM environment variable (if one exists) to delete files. If one does not exist, the ERASE command is used which is what was used previously git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/makelib.vc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/makelib.vc b/src/makelib.vc index 67158bab05..2c4b8b9b5a 100644 --- a/src/makelib.vc +++ b/src/makelib.vc @@ -14,7 +14,11 @@ WXDIR = $(WXWIN) !include $(WXDIR)\src\makevc.env -all: $(EXTRATARGETS) $(LIBTARGET) +!if "$(RM)" == "" +RM= erase +!endif + +all: $(D) $(EXTRATARGETS) $(LIBTARGET) $(D) : mkdir $(D) @@ -28,7 +32,7 @@ wxclean: nmake -f makefile.vc clean $(LIBTARGET): $(OBJECTS) - -erase $(LIBTARGET) + -$(RM) $(LIBTARGET) $(implib) @<< -out:$(LIBTARGET) -machine:$(CPU) @@ -36,10 +40,10 @@ $(OBJECTS) << clean: - -erase $(LIBTARGET) - -erase $(OBJECTS) - -erase *.exe - -erase *.res - -erase *.map - -erase *.sbr - -erase *.pdb + -$(RM) $(LIBTARGET) + -$(RM) $(OBJECTS) + -$(RM) *.exe + -$(RM) *.res + -$(RM) *.map + -$(RM) *.sbr + -$(RM) *.pdb