diff --git a/CppParser/CppParser_vs90.vcproj b/CppParser/CppParser_vs90.vcproj
index 3b0f884e1..44bd9baad 100644
--- a/CppParser/CppParser_vs90.vcproj
+++ b/CppParser/CppParser_vs90.vcproj
@@ -56,7 +56,7 @@
Name="VCPreLinkEventTool"/>
appendChild(pTargetName);
}
}
+ if (platform == "x64")
+ {
+ Poco::AutoPtr pLibs = pProjectDoc->getElementsByTagName("Lib");
+ for (unsigned long i = 0; i < pLibs->length(); i++)
+ {
+ Poco::XML::Element* pLib = static_cast(pLibs->item(i));
+ Poco::AutoPtr pTargetMachine = pProjectDoc->createElement("TargetMachine");
+ Poco::AutoPtr pText = pProjectDoc->createTextNode("MachineX64");
+ pTargetMachine->appendChild(pText);
+ pLib->appendChild(pTargetMachine);
+ }
+ }
}
void fix2012Project(Poco::AutoPtr pProjectDoc, const std::set& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps)
diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template
index e2e836e5c..cfc9d1d5d 100644
--- a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template
@@ -57,7 +57,7 @@
OutputFile="bin\static_mt\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib"
- IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
+ IgnoreDefaultLibraryNames="nafxcwd.lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
diff --git a/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template
index 5fc0496a5..1c0e428d7 100644
--- a/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template
@@ -59,7 +59,7 @@
OutputFile="bin\static_mt\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib"
- IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
+ IgnoreDefaultLibraryNames="nafxcw.lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
diff --git a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template
index 2c7520b6d..46e17e106 100644
--- a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template
@@ -57,7 +57,7 @@
OutputFile="bin64\static_mt\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
- IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
+ IgnoreDefaultLibraryNames="nafxcwd.lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
diff --git a/ProGen/templates/vs100/x64/testsuite/release_static_mt.template b/ProGen/templates/vs100/x64/testsuite/release_static_mt.template
index e68b0eb2d..9bd31b72a 100644
--- a/ProGen/templates/vs100/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs100/x64/testsuite/release_static_mt.template
@@ -59,7 +59,7 @@
OutputFile="bin64\static_mt\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
- IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
+ IgnoreDefaultLibraryNames="nafxcw.lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
index e2e836e5c..cfc9d1d5d 100644
--- a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
@@ -57,7 +57,7 @@
OutputFile="bin\static_mt\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib"
- IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
+ IgnoreDefaultLibraryNames="nafxcwd.lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
diff --git a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
index 5fc0496a5..1c0e428d7 100644
--- a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
@@ -59,7 +59,7 @@
OutputFile="bin\static_mt\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib"
- IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
+ IgnoreDefaultLibraryNames="nafxcw.lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
diff --git a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
index 2c7520b6d..46e17e106 100644
--- a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
@@ -57,7 +57,7 @@
OutputFile="bin64\static_mt\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
- IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
+ IgnoreDefaultLibraryNames="nafxcwd.lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
diff --git a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
index e68b0eb2d..9bd31b72a 100644
--- a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
@@ -59,7 +59,7 @@
OutputFile="bin64\static_mt\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
- IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
+ IgnoreDefaultLibraryNames="nafxcw.lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template
index fcc713332..002b50bbf 100644
--- a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template
@@ -57,7 +57,7 @@
OutputFile="bin\static_mt\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib"
- IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
+ IgnoreDefaultLibraryNames="nafxcwd.lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
diff --git a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template
index 0dd147bf3..cdd93d79f 100644
--- a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template
@@ -59,7 +59,7 @@
OutputFile="bin\static_mt\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib"
- IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
+ IgnoreDefaultLibraryNames="nafxcw.lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
diff --git a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template
index e4edafbb1..b17d78c82 100644
--- a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template
@@ -57,7 +57,7 @@
OutputFile="bin64\static_mt\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
- IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
+ IgnoreDefaultLibraryNames="nafxcwd.lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
diff --git a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template b/ProGen/templates/vs90/x64/testsuite/release_static_mt.template
index 2457a99a4..a2a5a718b 100644
--- a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs90/x64/testsuite/release_static_mt.template
@@ -59,7 +59,7 @@
OutputFile="bin64\static_mt\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
- IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
+ IgnoreDefaultLibraryNames="nafxcw.lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
diff --git a/Redis/Redis_vs90.vcproj b/Redis/Redis_vs90.vcproj
index e94143dfc..9dfe61194 100644
--- a/Redis/Redis_vs90.vcproj
+++ b/Redis/Redis_vs90.vcproj
@@ -56,7 +56,7 @@
Name="VCPreLinkEventTool"/>
%(AdditionalOptions)
- %(AdditionalDependencies)
+ Iphlpapi.lib;%(AdditionalDependencies)
bin\static_mt\TestSuited.exe
..\..\lib;%(AdditionalLibraryDirectories)
nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)
@@ -233,7 +233,7 @@
%(AdditionalOptions)
- %(AdditionalDependencies)
+ Iphlpapi.lib;%(AdditionalDependencies)
bin\static_mt\TestSuite.exe
..\..\lib;%(AdditionalLibraryDirectories)
nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)
diff --git a/XML/testsuite/TestSuite_vs90.vcproj b/XML/testsuite/TestSuite_vs90.vcproj
index 767923c11..0bc0eccee 100644
--- a/XML/testsuite/TestSuite_vs90.vcproj
+++ b/XML/testsuite/TestSuite_vs90.vcproj
@@ -57,7 +57,7 @@
Name="VCPreLinkEventTool"/>