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/common.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/common.props')
| -rw-r--r-- | windows/msvc/common.props | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/windows/msvc/common.props b/windows/msvc/common.props index ce0651d2e..4bc5df541 100644 --- a/windows/msvc/common.props +++ b/windows/msvc/common.props @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ImportGroup Label="PropertySheets" />
+ <ImportGroup Label="PropertySheets">
+ <Import Project="env.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir>$(ProjectDir)</OutDir>
- <IntDir>$(ProjectDir)build\$(Configuration)$(Platform)\</IntDir>
+ <OutDir>$(PyOutDir)</OutDir>
+ <IntDir>$(PyBuildDir)$(Configuration)$(Platform)\</IntDir>
+ <PyIncDirs>$(PyBaseDir);$(PyBaseDir)windows;$(PyBaseDir)windows\msvc;$(PyBuildDir)</PyIncDirs>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>.\;..\;.\build;.\msvc</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(PyIncDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<WarningLevel>Level1</WarningLevel>
|