diff options
| author | stijn | 2015-01-02 11:49:23 +0100 |
|---|---|---|
| committer | stijn | 2015-01-02 16:52:07 +0100 |
| commit | 8dec62a1a41f1c48aa7bdd3848c0f46a62de4f29 (patch) | |
| tree | ae589d8860bbb3597fa99085b733e0521c4450ee /windows/msvc/sources.props | |
| parent | fd40a9c38e7e15850b8802fb9845dc4ea423f53b (diff) | |
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.
Diffstat (limited to 'windows/msvc/sources.props')
| -rw-r--r-- | windows/msvc/sources.props | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/windows/msvc/sources.props b/windows/msvc/sources.props index 364f36b04..7ec0b652b 100644 --- a/windows/msvc/sources.props +++ b/windows/msvc/sources.props @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PyBaseDir>$(MsbuildThisFileDirectory)..\..\</PyBaseDir> - </PropertyGroup> + <Import Project="env.props" Condition="$(PyEnvIncluded)!=True"/> <ItemGroup> <ClCompile Include="$(PyBaseDir)py\*.c" /> <ClCompile Include="$(PyBaseDir)extmod\*.c" /> |