Skip to content

Commit

Permalink
msvc: Allow overriding of build options with custom file
Browse files Browse the repository at this point in the history
- by default look for a user.props in the msvc directory, which is more convenient
  than the built-in way of looking for such file in the user's home directory
- make git ignore the file
  • Loading branch information
stinos committed Apr 30, 2015
1 parent 6f218d7 commit a62c106
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@ tests/*.out
######################
__pycache__/

# Customized Makefile overrides
# Customized Makefile/project overrides
######################
GNUmakefile
user.props
5 changes: 4 additions & 1 deletion windows/micropython.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@
<Import Project="msvc/common.props" />
<Import Project="msvc/release.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Label="UserMacros">
<CustomPropsFile Condition="'$(CustomPropsFile)'==''">msvc/user.props</CustomPropsFile>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile />
Expand All @@ -94,6 +96,7 @@
</ItemGroup>
<Import Project="msvc/sources.props" />
<Import Project="msvc/genhdr.targets" />
<Import Project="$(CustomPropsFile)" Condition="exists('$(CustomPropsFile)')" />
<Target Name="GenHeaders" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders">
</Target>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down

0 comments on commit a62c106

Please sign in to comment.