diff options
| author | Daan Leijen <daan@microsoft.com> | 2021-06-07 16:51:14 -0700 |
|---|---|---|
| committer | Daan Leijen <daan@microsoft.com> | 2021-06-07 16:51:14 -0700 |
| commit | 9974b0ee23e7dbfaebe2c55efa806e48ff21509c (patch) | |
| tree | 0e866dd0a9df5922a29b786cc348508d0d33a640 /ide | |
| parent | 069b3276df2c7d2b1f06e38fb94d3ea632c8f1af (diff) | |
| parent | aeb62c2711d0ffdea1e097d00b5972ccc2fc569b (diff) | |
Merge branch 'dev' into dev-slice
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/vs2019/mimalloc-override-test.vcxproj | 3 | ||||
| -rw-r--r-- | ide/vs2019/mimalloc-override.vcxproj | 12 | ||||
| -rw-r--r-- | ide/vs2019/mimalloc.vcxproj | 12 |
3 files changed, 9 insertions, 18 deletions
diff --git a/ide/vs2019/mimalloc-override-test.vcxproj b/ide/vs2019/mimalloc-override-test.vcxproj index 28731d4..7a9202f 100644 --- a/ide/vs2019/mimalloc-override-test.vcxproj +++ b/ide/vs2019/mimalloc-override-test.vcxproj @@ -177,8 +177,7 @@ </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\test\rtest\src\main.cxx" /> - <ClCompile Include="..\..\test\rtest\src\memory_storage.cxx" /> + <ClCompile Include="..\..\test\main-override.cpp" /> </ItemGroup> <ItemGroup> <ProjectReference Include="mimalloc-override.vcxproj"> diff --git a/ide/vs2019/mimalloc-override.vcxproj b/ide/vs2019/mimalloc-override.vcxproj index e00f7af..4136e57 100644 --- a/ide/vs2019/mimalloc-override.vcxproj +++ b/ide/vs2019/mimalloc-override.vcxproj @@ -94,8 +94,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories> - </AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <SupportJustMyCode>false</SupportJustMyCode> @@ -123,8 +122,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories> - </AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <PreprocessorDefinitions>MI_DEBUG=3;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <SupportJustMyCode>false</SupportJustMyCode> @@ -153,8 +151,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories> - </AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> @@ -186,8 +183,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories> - </AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> diff --git a/ide/vs2019/mimalloc.vcxproj b/ide/vs2019/mimalloc.vcxproj index f301bc5..98dee52 100644 --- a/ide/vs2019/mimalloc.vcxproj +++ b/ide/vs2019/mimalloc.vcxproj @@ -96,8 +96,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories> - </AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions> <CompileAs>CompileAsCpp</CompileAs> <SupportJustMyCode>false</SupportJustMyCode> @@ -116,8 +115,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories> - </AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions> <CompileAs>CompileAsCpp</CompileAs> <SupportJustMyCode>false</SupportJustMyCode> @@ -144,8 +142,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories> - </AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> @@ -173,8 +170,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories> - </AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions> <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> |