From: George Tasker Date: Tue, 16 Jan 2001 10:57:48 +0000 (+0000) Subject: Added code to create $D (debug or release) subdir to put the .OBJ files into. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fcc864256fbd539bd547876e342d532022bdb0d5?ds=inline 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 --- 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