From 8dec62a1a41f1c48aa7bdd3848c0f46a62de4f29 Mon Sep 17 00:00:00 2001
From: stijn
Date: Fri, 2 Jan 2015 11:49:23 +0100
Subject: msvc: Define main build/include directories in a single location

- Use a single file env.props for defining the main directories used when building.
  env.props resolves the base directory and defines overridable output directories,
  and is used by all other build files.
- Fix the build currently failing, basically because the preprocessing command for generating
  qstrdefs uses different include directories than the build itself does.
  (specifically, qstrdefs.h uses #include "py/mpconfig.h" since the fixes for #1022
  in 51dfcb4, so we need to use the base directory as include directory, not the py dir itself).
  So define a single variable containing the include directories instead and use it where needed.
---
 windows/msvc/env.props | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 windows/msvc/env.props

(limited to 'windows/msvc/env.props')

diff --git a/windows/msvc/env.props b/windows/msvc/env.props
new file mode 100644
index 000000000..824b529e6
--- /dev/null
+++ b/windows/msvc/env.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PyBaseDir>$([System.IO.Path]::GetFullPath(`$(MSBuildThisFileDirectory)..\..`))\</PyBaseDir>
+    <PyBuildDir Condition="'$(PyBuildDir)'==''">$(MSBuildThisFileDirectory)build\</PyBuildDir>
+    <PyOutDir Condition="'$(PyOutDir)'==''">$(PyBaseDir)windows\</PyOutDir>
+    <PyEnvIncluded>True</PyEnvIncluded>
+  </PropertyGroup>
+</Project>
-- 
cgit v1.2.3