aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2016-03-22 03:03:11 -0400
committerJay Satiro <raysatiro@yahoo.com>2016-03-22 03:03:11 -0400
commitf7bb1fc1d78c6a4389d56438be686534d8b637ee (patch)
tree165f55bf7b0b79579ab2e70b3fe520daf1c6c469
parentf974ffdd4b777e708cdf79c5454eb9318152fbd9 (diff)
build-wolfssl: Update VS properties for wolfSSL v3.9.0
- Do not use wolfSSL's sample user-setting files. wolfSSL starting in v3.9.0 has added their own sample user settings that are applied by default, but we don't use them because we have our own settings. - Do not use wolfSSL's Visual Studio Unicode character setting. wolfSSL Visual Studio projects use the Unicode character set however our settings and options imitate mingw build which does not use the Unicode character set. This does not appear to have any effect at the moment but better safe than sorry. These changes are backwards compatible with earlier versions.
-rw-r--r--projects/wolfssl_override.props15
1 files changed, 10 insertions, 5 deletions
diff --git a/projects/wolfssl_override.props b/projects/wolfssl_override.props
index 191ae92d8..e37d0b7aa 100644
--- a/projects/wolfssl_override.props
+++ b/projects/wolfssl_override.props
@@ -8,17 +8,22 @@ file by using the CustomAfterMicrosoftCommonTargets property.
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions);
- </PreprocessorDefinitions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions);</PreprocessorDefinitions>
<!--
Our options file wolfssl_options.h is copied by build-wolfssl to
$(SolutionDir)\wolfssl\options.h. It includes all the options we need
to build wolfSSL for compatibility. See wolfssl_options.h for more info.
-->
- <ForcedIncludeFiles>%(ForcedIncludeFiles);
- $(SolutionDir)\wolfssl\options.h;
- </ForcedIncludeFiles>
+ <ForcedIncludeFiles>$(SolutionDir)\wolfssl\options.h;%(ForcedIncludeFiles);</ForcedIncludeFiles>
+ <!--
+ Do not use the Unicode character set since their mingw config doesn't.
+ Do not use their IDE\WIN\user_settings.h since we have wolfssl_options.h.
+ -->
+ <UndefinePreprocessorDefinitions>_UNICODE;UNICODE;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(UndefinePreprocessorDefinitions);</UndefinePreprocessorDefinitions>
</ClCompile>
+ <ResourceCompile>
+ <UndefinePreprocessorDefinitions>_UNICODE;UNICODE;%(UndefinePreprocessorDefinitions);</UndefinePreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<!--
The project GUID for wolfssl.vcxproj is 73973223-5EE8-41CA-8E88-1D60E89A237B.