Skip to content

Commit d202833

Browse files
committed
Implement the mimalloc option
1 parent 537bce7 commit d202833

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

platforms/Windows/bld/bld.wixproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
77
TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
88
TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
9+
ENABLE_MIMALLOC=$(ENABLE_MIMALLOC);
910
</DefineConstants>
1011
</PropertyGroup>
1112

platforms/Windows/bld/bld.wxs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,17 @@
479479
</Component>
480480
</ComponentGroup>
481481

482+
<ComponentGroup Id="mimalloc" Directory="_usr_bin">
483+
<?if $(ENABLE_MIMALLOC) == true ?>
484+
<Component>
485+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
486+
</Component>
487+
<Component>
488+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-override.dll" />
489+
</Component>
490+
<?endif?>
491+
</ComponentGroup>
492+
482493
<ComponentGroup Id="EnvironmentVariables">
483494
<Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
484495
<Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin]" />
@@ -504,6 +515,7 @@
504515
<ComponentGroupRef Id="SwiftMacros" />
505516
<ComponentGroupRef Id="FoundationMacros" />
506517
<ComponentGroupRef Id="TestingMacros" />
518+
<ComponentGroupRef Id="mimalloc" />
507519

508520
<ComponentGroupRef Id="ClangResources" />
509521
<ComponentGroupRef Id="SwiftClangResources" />

0 commit comments

Comments
 (0)