From a62c10697437df8af19f57d8a9aa9af21624a399 Mon Sep 17 00:00:00 2001
From: stijn <stinos@zoho.com>
Date: Thu, 30 Apr 2015 10:14:59 +0200
Subject: [PATCH] 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
---
.gitignore | 4 +++-
windows/micropython.vcxproj | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 64f72aee5..450bbd863 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 62886d1a1..ad93252ba 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" />
--
GitLab