From 0bca799f33dda4d9d2eb468edc863761edd32d5c Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Fri, 1 May 2009 10:05:13 +0000 Subject: Ticket #810 and part of #706: changed samples output directory to bin/samples/$TARGET git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2669 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/build/Samples-vc.mak | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pjsip-apps/build/Samples-vc.mak') diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak index acd598ec..8f88a0a9 100644 --- a/pjsip-apps/build/Samples-vc.mak +++ b/pjsip-apps/build/Samples-vc.mak @@ -55,7 +55,7 @@ LDFLAGS = $(BUILD_FLAGS) $(LIBS) \ SRCDIR = ..\src\samples OBJDIR = .\output\samples-$(TARGET) -BINDIR = ..\bin\samples +BINDIR = ..\bin\samples\$(TARGET) SAMPLES = $(BINDIR)\auddemo.exe \ @@ -84,20 +84,24 @@ SAMPLES = $(BINDIR)\auddemo.exe \ $(BINDIR)\tonegen.exe -all: $(OBJDIR) $(SAMPLES) +all: $(BINDIR) $(OBJDIR) $(SAMPLES) $(SAMPLES): $(SRCDIR)\$(@B).c $(LIBS) $(SRCDIR)\util.h Samples-vc.mak cl -nologo -c $(SRCDIR)\$(@B).c /Fo$(OBJDIR)\$(@B).obj $(CFLAGS) - cl /nologo $(OBJDIR)\$(@B).obj /Fe$(BINDIR)\$(@B)-$(TARGET).exe /Fm$(OBJDIR)\$(@B).map $(LDFLAGS) + cl /nologo $(OBJDIR)\$(@B).obj /Fe$@ /Fm$(OBJDIR)\$(@B).map $(LDFLAGS) @rem the following two lines is just for cleaning up the 'bin' directory - if exist $(BINDIR)\*$(TARGET).ilk del /Q $(BINDIR)\*$(TARGET).ilk - if exist $(BINDIR)\*$(TARGET).pdb del /Q $(BINDIR)\*$(TARGET).pdb + if exist $(BINDIR)\*.ilk del /Q $(BINDIR)\*.ilk + if exist $(BINDIR)\*.pdb del /Q $(BINDIR)\*.pdb + +$(BINDIR): + if not exist $(BINDIR) mkdir $(BINDIR) $(OBJDIR): if not exist $(OBJDIR) mkdir $(OBJDIR) clean: echo Cleaning up samples... - if exist $(BINDIR) del /Q $(BINDIR)\*$(TARGET).* + if exist $(BINDIR) del /Q $(BINDIR)\* + if exist $(BINDIR) rmdir $(BINDIR) if exist $(OBJDIR) del /Q $(OBJDIR)\*.* -- cgit v1.2.3