aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.