diff options
author | daan <daanl@outlook.com> | 2020-02-02 15:50:02 -0800 |
---|---|---|
committer | daan <daanl@outlook.com> | 2020-02-02 15:50:02 -0800 |
commit | f5ab2c1c49bfd153db341e68dcb86fe045bec445 (patch) | |
tree | eac2c12833e47aaf27f6a4f109004741e94cde8a | |
parent | 865965b8c0c83674018be95b9bfdd65a4d2f7d2e (diff) |
suppress spurious warnings with clang-cl
-rw-r--r-- | ide/vs2017/mimalloc-override.vcxproj | 8 | ||||
-rw-r--r-- | ide/vs2017/mimalloc-test-stress.vcxproj | 4 | ||||
-rw-r--r-- | ide/vs2017/mimalloc.vcxproj | 20 |
3 files changed, 22 insertions, 10 deletions
diff --git a/ide/vs2017/mimalloc-override.vcxproj b/ide/vs2017/mimalloc-override.vcxproj index 4225a2f..f828ba9 100644 --- a/ide/vs2017/mimalloc-override.vcxproj +++ b/ide/vs2017/mimalloc-override.vcxproj @@ -95,7 +95,7 @@ <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <SupportJustMyCode>false</SupportJustMyCode> <CompileAs>Default</CompileAs> @@ -123,7 +123,7 @@ <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <SupportJustMyCode>false</SupportJustMyCode> <CompileAs>Default</CompileAs> @@ -152,7 +152,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> <WholeProgramOptimization>false</WholeProgramOptimization> @@ -184,7 +184,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> <WholeProgramOptimization>false</WholeProgramOptimization> diff --git a/ide/vs2017/mimalloc-test-stress.vcxproj b/ide/vs2017/mimalloc-test-stress.vcxproj index 325ba3f..b8267d0 100644 --- a/ide/vs2017/mimalloc-test-stress.vcxproj +++ b/ide/vs2017/mimalloc-test-stress.vcxproj @@ -149,8 +149,8 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ProjectReference Include="mimalloc-override.vcxproj"> - <Project>{abb5eae7-b3e6-432e-b636-333449892ea7}</Project> + <ProjectReference Include="mimalloc.vcxproj"> + <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project> </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/ide/vs2017/mimalloc.vcxproj b/ide/vs2017/mimalloc.vcxproj index e08deec..fa236d6 100644 --- a/ide/vs2017/mimalloc.vcxproj +++ b/ide/vs2017/mimalloc.vcxproj @@ -90,6 +90,18 @@ <TargetExt>.lib</TargetExt> <TargetName>mimalloc-static</TargetName> </PropertyGroup> + <PropertyGroup Label="LLVM" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <UseLlvmLib>false</UseLlvmLib> + </PropertyGroup> + <PropertyGroup Label="LLVM" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <UseLlvmLib>false</UseLlvmLib> + </PropertyGroup> + <PropertyGroup Label="LLVM" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <UseLlvmLib>false</UseLlvmLib> + </PropertyGroup> + <PropertyGroup Label="LLVM" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <UseLlvmLib>false</UseLlvmLib> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -97,7 +109,7 @@ <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions> <CompileAs>CompileAsCpp</CompileAs> <SupportJustMyCode>false</SupportJustMyCode> <LanguageStandard>stdcpp17</LanguageStandard> @@ -116,7 +128,7 @@ <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions> <CompileAs>CompileAsCpp</CompileAs> <SupportJustMyCode>false</SupportJustMyCode> <LanguageStandard>stdcpp17</LanguageStandard> @@ -143,7 +155,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> <WholeProgramOptimization>false</WholeProgramOptimization> @@ -170,7 +182,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> <WholeProgramOptimization>false</WholeProgramOptimization> |