Changeset 391 for python/trunk/PC/VS8.0/pyproject.vsprops

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• PC/VS8.0/pyproject.vsprops (modified) (3 diffs)

python/trunk/PC/VS8.0/pyproject.vsprops

@@ -39 +39 @@
         <UserMacro
                 Name="PyDllName"
-                Value="python26"
+                Value="python27"
         />
         <UserMacro
@@ -48 +48 @@
                 Name="externalsDir"
                 Value="..\..\.."
+        />
+        <UserMacro
+                Name="bsddb47Dir"
+                Value="$(externalsDir)\db-4.7.25.0\build_windows"
+        />
+        <UserMacro
+                Name="bsddb47DepLibs"
+                Value="ws2_32.lib"
         />
         <UserMacro
@@ -66 +74 @@
         />
         <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"
+                Value="$(externalsDir)\sqlite-3.6.21"
         />
         <UserMacro
                 Name="bz2Dir"
-                Value="$(externalsDir)\bzip2-1.0.5"
+                Value="$(externalsDir)\bzip2-1.0.6"
         />
         <UserMacro
                 Name="opensslDir"
-                Value="$(externalsDir)\openssl-0.9.8g"
+                Value="$(externalsDir)\openssl-0.9.8y"
         />
         <UserMacro