From 27445940f890f0c40950e2f6e1dde0530bd9e87e Mon Sep 17 00:00:00 2001 From: zergtmn Date: Tue, 5 Apr 2011 01:14:31 +0600 Subject: [PATCH] [11314] Fix typo in file name for generated PDB file --- dep/lib/win32_debug/.gitignore | 1 - dep/lib/win32_release/.gitignore | 1 - dep/lib/x64_Debug/.gitignore | 1 - dep/lib/x64_release/.gitignore | 1 - src/shared/revision_nr.h | 2 +- win/VC100/ACE_vc10.vcxproj | 8 ++++---- win/VC90/ACE_vc9.vcproj | 8 ++++---- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dep/lib/win32_debug/.gitignore b/dep/lib/win32_debug/.gitignore index bf1241d78..bf8a110f8 100644 --- a/dep/lib/win32_debug/.gitignore +++ b/dep/lib/win32_debug/.gitignore @@ -11,5 +11,4 @@ # ACE* -ADE* tbb* diff --git a/dep/lib/win32_release/.gitignore b/dep/lib/win32_release/.gitignore index bf1241d78..bf8a110f8 100644 --- a/dep/lib/win32_release/.gitignore +++ b/dep/lib/win32_release/.gitignore @@ -11,5 +11,4 @@ # ACE* -ADE* tbb* diff --git a/dep/lib/x64_Debug/.gitignore b/dep/lib/x64_Debug/.gitignore index bf1241d78..bf8a110f8 100644 --- a/dep/lib/x64_Debug/.gitignore +++ b/dep/lib/x64_Debug/.gitignore @@ -11,5 +11,4 @@ # ACE* -ADE* tbb* diff --git a/dep/lib/x64_release/.gitignore b/dep/lib/x64_release/.gitignore index bf1241d78..bf8a110f8 100644 --- a/dep/lib/x64_release/.gitignore +++ b/dep/lib/x64_release/.gitignore @@ -11,5 +11,4 @@ # ACE* -ADE* tbb* diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 54052a5e1..18622a0e1 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11313" + #define REVISION_NR "11314" #endif // __REVISION_NR_H__ diff --git a/win/VC100/ACE_vc10.vcxproj b/win/VC100/ACE_vc10.vcxproj index b0aa94832..519755476 100644 --- a/win/VC100/ACE_vc10.vcxproj +++ b/win/VC100/ACE_vc10.vcxproj @@ -171,7 +171,7 @@ true %(AdditionalLibraryDirectories) true - $(TargetDir)\ADEd.pdb + $(TargetDir)\ACEd.pdb Windows $(OutDir)ACEd.lib MachineX86 @@ -210,7 +210,7 @@ true %(AdditionalLibraryDirectories) true - $(TargetDir)\ADEd.pdb + $(TargetDir)\ACEd.pdb Windows $(OutDir)ACEd.lib MachineX64 @@ -323,7 +323,7 @@ true %(AdditionalLibraryDirectories) true - $(TargetDir)\ADEd.pdb + $(TargetDir)\ACEd.pdb Windows $(OutDir)ACEd.lib MachineX86 @@ -362,7 +362,7 @@ true %(AdditionalLibraryDirectories) true - $(TargetDir)\ADEd.pdb + $(TargetDir)\ACEd.pdb Windows $(OutDir)ACEd.lib MachineX64 diff --git a/win/VC90/ACE_vc9.vcproj b/win/VC90/ACE_vc9.vcproj index c07eacb99..eea718a74 100644 --- a/win/VC90/ACE_vc9.vcproj +++ b/win/VC90/ACE_vc9.vcproj @@ -82,7 +82,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)\ADEd.pdb" + ProgramDatabaseFile="$(TargetDir)\ACEd.pdb" SubSystem="2" ImportLibrary="$(OutDir)\ACEd.lib" TargetMachine="1" @@ -173,7 +173,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)\ADEd.pdb" + ProgramDatabaseFile="$(TargetDir)\ACEd.pdb" SubSystem="2" ImportLibrary="$(OutDir)\ACEd.lib" TargetMachine="17" @@ -442,7 +442,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)\ADEd.pdb" + ProgramDatabaseFile="$(TargetDir)\ACEd.pdb" SubSystem="2" ImportLibrary="$(OutDir)\ACEd.lib" TargetMachine="1" @@ -533,7 +533,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)\ADEd.pdb" + ProgramDatabaseFile="$(TargetDir)\ACEd.pdb" SubSystem="2" ImportLibrary="$(OutDir)\ACEd.lib" TargetMachine="17"