diff --git a/windows/msvc/common.props b/windows/msvc/common.props
index 73103f627a..cfb6adbc14 100644
--- a/windows/msvc/common.props
+++ b/windows/msvc/common.props
@@ -1,13 +1,13 @@
-
+
$(PyOutDir)
- $(PyBuildDir)$(Configuration)$(Platform)\
- $(PyBaseDir);$(PyBaseDir)windows;$(PyBaseDir)windows\msvc;$(PyBuildDir)
+ $(PyIntDir)
+ $(PyBuildDir)copycookie$(Configuration)$(Platform)
@@ -22,5 +22,24 @@
true
-
+
+
+ $(PyWinDir)%(FileName)%(Extension)
+
+
+
+
+
+
+
+
+
+
+
diff --git a/windows/msvc/env.props b/windows/msvc/env.props
deleted file mode 100644
index 824b529e67..0000000000
--- a/windows/msvc/env.props
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- $([System.IO.Path]::GetFullPath(`$(MSBuildThisFileDirectory)..\..`))\
- $(MSBuildThisFileDirectory)build\
- $(PyBaseDir)windows\
- True
-
-
diff --git a/windows/msvc/genhdr.targets b/windows/msvc/genhdr.targets
index 93bb74ee9d..3d9a148bed 100644
--- a/windows/msvc/genhdr.targets
+++ b/windows/msvc/genhdr.targets
@@ -1,7 +1,7 @@
-
+
diff --git a/windows/msvc/paths.props b/windows/msvc/paths.props
new file mode 100644
index 0000000000..7166982434
--- /dev/null
+++ b/windows/msvc/paths.props
@@ -0,0 +1,45 @@
+
+
+
+ True
+
+
+
+
+ $([System.IO.Path]::GetFullPath(`$(MSBuildThisFileDirectory)..\..`))\
+ $(PyBaseDir)windows\
+ $(PyWinDir)build\
+
+
+ $(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc
+
+
+ $(Platform)
+ $(Configuration)
+
+
+ $(PyBuildDir)$(PyConfiguration)$(PyPlatform)\
+ $(PyOutDir)obj\
+
+
diff --git a/windows/msvc/sources.props b/windows/msvc/sources.props
index eea28fc46e..b840025006 100644
--- a/windows/msvc/sources.props
+++ b/windows/msvc/sources.props
@@ -1,6 +1,6 @@
-
+