Changeset 2638 for pjproject/trunk/pjsip-apps/build/Samples-vc.mak

Timestamp:

Apr 22, 2009 2:27:55 PM (15 years ago)

Author:

nanang

Message:

Ticket #706: Merged branch vs-reorg into trunk:

• Currently supported platforms are Win32 & WM6 std/pro.
• Renamed project test_pjsip with pjsip_test, also source directory 'test-pjsip' to 'test'.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip-apps/build/Samples-vc.mak (modified) (3 diffs)

pjproject/trunk/pjsip-apps/build/Samples-vc.mak

@@ -2 +2 @@
 LIBEXT = .lib
 
+TARGET = i386-win32-vs$(VC_VER)-$(BUILD_MODE)
+
 !if "$(BUILD_MODE)" == "debug"
-TARGET = i386-win32-vc$(VC_VER)-debug
+BUILD_FLAGS = /MTd /Od /Zi /W4
+!elseif "$(BUILD_MODE)" == "debug-static"
 BUILD_FLAGS = /MTd /Od /Zi /W4
 !elseif "$(BUILD_MODE)" == "debug-dynamic"
-TARGET = i386-win32-vc$(VC_VER)-debug
 BUILD_FLAGS = /MDd /Od /Zi /W4
 !elseif "$(BUILD_MODE)" == "release-static"
-TARGET = i386-win32-vc$(VC_VER)-release
 BUILD_FLAGS = /Ox /MT /DNDEBUG /W4
-!else
-TARGET = i386-win32-vc$(VC_VER)-$(BUILD_MODE)
+!elseif "$(BUILD_MODE)" == "release-dynamic"
 BUILD_FLAGS = /Ox /MD /DNDEBUG /W4
 !endif
@@ -89 +89 @@
 $(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$@ /Fm$(OBJDIR)\$(@B).map $(LDFLAGS)
+        cl /nologo $(OBJDIR)\$(@B).obj /Fe$(BINDIR)\$(@B)-$(TARGET).exe /Fm$(OBJDIR)\$(@B).map $(LDFLAGS)
+        @rem the following two lines is just for cleaning up the 'bin' directory
+        del /Q $(BINDIR)\*$(TARGET).ilk
+        del /Q $(BINDIR)\*$(TARGET).pdb
 
 $(OBJDIR):
@@ -96 +99 @@
 clean:
         echo Cleaning up samples...
-        if exist $(BINDIR) del /Q $(BINDIR)\*.*
+        if exist $(BINDIR) del /Q $(BINDIR)\*$(TARGET).*
         if exist $(OBJDIR) del /Q $(OBJDIR)\*.*