Merged revisions 78213,78215 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78213 | martin.v.loewis | 2010-02-18 10:22:20 +0100 (Do, 18 Feb 2010) | 3 lines
Stop providing crtassem.h symbols when compiling with
Visual Studio 2010, as msvcr100.dll is not a platform
assembly anymore.
........
r78215 | martin.v.loewis | 2010-02-18 13:45:45 +0100 (Do, 18 Feb 2010) | 1 line
Move bsddb47 macros before their use, to make VS 2010 happy.
........
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 0f3568a..fe90bd0 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -49,6 +49,14 @@
Value="..\.."
/>
<UserMacro
+ Name="bsddb47Dir"
+ Value="$(externalsDir)\db-4.7.25.0\build_windows"
+ />
+ <UserMacro
+ Name="bsddb47DepLibs"
+ Value="ws2_32.lib"
+ />
+ <UserMacro
Name="bsddbDir"
Value="$(bsddb47Dir)"
/>
@@ -65,14 +73,6 @@
Value=""
/>
<UserMacro
- Name="bsddb47Dir"
- Value="$(externalsDir)\db-4.7.25.0\build_windows"
- />
- <UserMacro
- Name="bsddb47DepLibs"
- Value="ws2_32.lib"
- />
- <UserMacro
Name="sqlite3Dir"
Value="$(externalsDir)\sqlite-3.5.9"
/>