diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-02-01 03:01:01 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-02-01 03:01:01 +0000 |
| commit | ff0519500e35668e0963fdc1af57141ebc78b019 (patch) | |
| tree | 82877d5defd6373b9a0f80a2e557af3320d9aa88 /pjsip-apps | |
| parent | 7b045089bcaa11025af7c60ae214f65c3d32f9cf (diff) | |
Fixed ticket #85: build errors when building samples with VS6/VS8
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@922 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/build/Samples-vc.mak | 8 | ||||
| -rw-r--r-- | pjsip-apps/build/samples.dsp | 4 | ||||
| -rw-r--r-- | pjsip-apps/build/samples.vcproj | 12 |
3 files changed, 14 insertions, 10 deletions
diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak index f785d57b..301d8b5c 100644 --- a/pjsip-apps/build/Samples-vc.mak +++ b/pjsip-apps/build/Samples-vc.mak @@ -1,5 +1,5 @@ -TARGET = i386-win32-vc6-$(BUILD_MODE) +TARGET = i386-win32-vc$(VC_VER)-$(BUILD_MODE) LIBEXT = .lib !if "$(BUILD_MODE)" == "debug" @@ -60,6 +60,10 @@ $(SAMPLES): $(SRCDIR)\$(@B).c $(LIBS) $(SRCDIR)\util.h Samples-vc.mak cl /nologo $(OBJDIR)\$(@B).obj /Fe$@ /Fm$(OBJDIR)\$(@B).map $(LDFLAGS) $(OBJDIR): - mkdir $(OBJDIR) + if not exist $(OBJDIR) mkdir $(OBJDIR) +clean: + echo Cleaning up samples... + if exist $(BINDIR) del /Q $(BINDIR)\*.* + if exist $(OBJDIR) del /Q $(OBJDIR)\*.* diff --git a/pjsip-apps/build/samples.dsp b/pjsip-apps/build/samples.dsp index 35ae129a..f6373600 100644 --- a/pjsip-apps/build/samples.dsp +++ b/pjsip-apps/build/samples.dsp @@ -41,7 +41,7 @@ CFG=samples - Win32 Debug # PROP Use_Debug_Libraries 0
# PROP Output_Dir "./output/samples-i386-win32-vc6-release"
# PROP Intermediate_Dir "./output/samples-i386-win32-vc6-release"
-# PROP Cmd_Line "nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release"
+# PROP Cmd_Line "nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=6"
# PROP Rebuild_Opt "/a"
# PROP Target_File "All samples"
# PROP Bsc_Name ""
@@ -62,7 +62,7 @@ CFG=samples - Win32 Debug # PROP Use_Debug_Libraries 1
# PROP Output_Dir "./output/samples-i386-win32-vc6-debug"
# PROP Intermediate_Dir "./output/samples-i386-win32-vc6-debug"
-# PROP Cmd_Line "nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug"
+# PROP Cmd_Line "nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=6"
# PROP Rebuild_Opt "/a"
# PROP Target_File "All samples"
# PROP Bsc_Name ""
diff --git a/pjsip-apps/build/samples.vcproj b/pjsip-apps/build/samples.vcproj index 74c1c181..422f06c8 100644 --- a/pjsip-apps/build/samples.vcproj +++ b/pjsip-apps/build/samples.vcproj @@ -25,9 +25,9 @@ >
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release"
- ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release /a"
- CleanCommandLine=""
+ BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"
+ ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"
+ CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"
Output="All samples"
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -48,9 +48,9 @@ >
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug"
- ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug /a"
- CleanCommandLine=""
+ BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"
+ ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"
+ CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"
Output="All samples"
PreprocessorDefinitions=""
IncludeSearchPath=""
|