From 90324e2c6466978f3c01e4a5a3c27d916b9ba9fa Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Fri, 24 Jun 2011 12:11:48 +0100 Subject: Fix 'aux' cluster breakages. Move aux into obj. Move aux directories into the appropriate obj directories. Makes cleaning easier, and is neater overall. Also fix some unrelated problems with cleaning in the msvc builds. --- common/msvc_top.mak | 8 ++++---- common/pcdefs.mak | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'common') diff --git a/common/msvc_top.mak b/common/msvc_top.mak index f5b328492..c0ef23680 100644 --- a/common/msvc_top.mak +++ b/common/msvc_top.mak @@ -35,10 +35,10 @@ clean_gs: nmake /f $(GLSRCDIR)\msvclib.mak \ GLSRCDIR=$(GLSRCDIR) GLGENDIR=$(GLGENDIR) \ GLOBJDIR=$(GLOBJDIR) clean - erase $(TARGET_XE).ilk - erase $(TARGET_XE).pdb - erase $(TARGET_XE).exp - erase $(TARGET_XE).lib + -erase $(TARGET_XE).ilk + -erase $(TARGET_XE).pdb + -erase $(TARGET_XE).exp + -erase $(TARGET_XE).lib # Define names of utility programs AUX=$(AUXDIR)$(D) diff --git a/common/pcdefs.mak b/common/pcdefs.mak index 0f82b7539..a5ef9dc7e 100644 --- a/common/pcdefs.mak +++ b/common/pcdefs.mak @@ -16,5 +16,5 @@ _I= XE=.exe CP_=copy /B -RM_=erase -RMN_=call $(COMMONDIR)\rm.bat +RM_=-erase +RMN_=-call $(COMMONDIR)\rm.bat -- cgit v1.2.3