diff options
| author | stijn <stinos@zoho.com> | 2015-04-30 10:14:59 +0200 |
|---|---|---|
| committer | stijn <stinos@zoho.com> | 2015-04-30 10:14:59 +0200 |
| commit | a62c10697437df8af19f57d8a9aa9af21624a399 (patch) | |
| tree | 00f2483e3fc880f8a7adb53b600102b03e109f1b | |
| parent | 6f218d74725e38e71aeed27250d8c67dd83401d8 (diff) | |
| download | micropython-a62c10697437df8af19f57d8a9aa9af21624a399.tar.gz micropython-a62c10697437df8af19f57d8a9aa9af21624a399.zip | |
msvc: Allow overriding of build options with custom file
- 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
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | windows/micropython.vcxproj | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 64f72aee5e..450bbd8639 100644 --- a/.gitignore +++ b/.gitignore @@ -33,5 +33,7 @@ tests/*.out ###################### __pycache__/ -# Customized Makefile overrides +# Customized Makefile/project overrides +###################### GNUmakefile +user.props diff --git a/windows/micropython.vcxproj b/windows/micropython.vcxproj index 62886d1a19..ad93252bad 100644 --- a/windows/micropython.vcxproj +++ b/windows/micropython.vcxproj @@ -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 /> @@ -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" /> |