diff --git a/IDE/src/Compiler/BfCompiler.bf b/IDE/src/Compiler/BfCompiler.bf index b1c848c5..214300ce 100644 --- a/IDE/src/Compiler/BfCompiler.bf +++ b/IDE/src/Compiler/BfCompiler.bf @@ -741,6 +741,9 @@ namespace IDE.Compiler String freeLinkName; switch (options.mAllocType) { + case .CRT: + mallocLinkName = "malloc"; + freeLinkName = "free"; case .Debug: optionFlags |= .DebugAlloc; mallocLinkName = ""; @@ -748,9 +751,6 @@ namespace IDE.Compiler case .Stomp: mallocLinkName = "StompAlloc"; freeLinkName = "StompFree"; - case .CRT: - mallocLinkName = "malloc"; - freeLinkName = "free"; case .JEMalloc, .JEMalloc_Debug: mallocLinkName = "je_malloc"; freeLinkName = "je_free"; diff --git a/IDE/src/Workspace.bf b/IDE/src/Workspace.bf index 54e9958f..a73380ee 100644 --- a/IDE/src/Workspace.bf +++ b/IDE/src/Workspace.bf @@ -214,9 +214,9 @@ namespace IDE public enum AllocType { + CRT, Debug, Stomp, - CRT, JEMalloc, JEMalloc_Debug, TCMalloc, diff --git a/IDE/src/ui/WorkspaceProperties.bf b/IDE/src/ui/WorkspaceProperties.bf index aeaf7fc8..4aaf8b91 100644 --- a/IDE/src/ui/WorkspaceProperties.bf +++ b/IDE/src/ui/WorkspaceProperties.bf @@ -734,7 +734,7 @@ namespace IDE.ui AddPropertiesItem(category, "Incremental Build", "mIncrementalBuild"); AddPropertiesItem(category, "Intermediate Type", "mIntermediateType"); var (allocCategory, allocPropEntry) = AddPropertiesItem(category, "Memory Allocator", "mAllocType", - scope String[] ("Debug", "Stomp (Debug)", "CRT", "JEMalloc", "JEMalloc Debug", "TCMalloc", "TCMalloc Debug")); + scope String[] ("CRT", "Debug", "Stomp (Paranoid)", "JEMalloc", "JEMalloc Debug", "TCMalloc", "TCMalloc Debug")); var (mallocItem, mallocPropEntry) = AddPropertiesItem(allocCategory, "Malloc", "mAllocMalloc"); var (freeItem, freePropEntry) = AddPropertiesItem(allocCategory, "Free", "mAllocFree"); allocPropEntry.mOnUpdate.Add(new () =>