add HXCPP_TRACY_NO_EXIT & HXCPP_TRACY_ON_DEMAND support

HaxeFoundation · Sep 9, 2024 · 340e90b · 340e90b
1 parent 8e5378e
commit 340e90b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/hx/gc/Immix.cpp b/src/hx/gc/Immix.cpp
@@ -6621,7 +6621,7 @@ void SetTopOfStack(int *inTop,bool inForce)
 
 void *InternalNew(int inSize,bool inIsObject)
 {
-   HX_STACK_FRAME("GC", "new", 0, "GC::new", __FILE__, __LINE__, 0)
+   // HX_STACK_FRAME("GC", "new", 0, "GC::new", __FILE__, __LINE__, 0)
 
    #ifdef HXCPP_DEBUG
    if (sgSpamCollects && sgAllocsSinceLastSpam>=sgSpamCollects)
@@ -6732,7 +6732,7 @@ void *InternalRealloc(int inFromSize, void *inData,int inSize, bool inExpand)
       return hx::InternalNew(inSize,false);
    }
 
-   HX_STACK_FRAME("GC", "realloc", 0, "GC::relloc", __FILE__ , __LINE__, 0)
+   // HX_STACK_FRAME("GC", "realloc", 0, "GC::relloc", __FILE__ , __LINE__, 0)
 
    #ifdef HXCPP_DEBUG
    if (sgSpamCollects && sgAllocsSinceLastSpam>=sgSpamCollects)

diff --git a/toolchain/common-defines.xml b/toolchain/common-defines.xml
@@ -39,7 +39,8 @@
  <flag value='-DHXCPP_WINXP_COMPAT' if="HXCPP_WINXP_COMPAT" tag="haxe"/>
 
  <flag value='-DHXCPP_TRACY' if="HXCPP_TRACY" tag="haxe"/>
- <flag value='-DHXCPP_TRACY_DISABLE_STACKS' if="HXCPP_TRACY_DISABLE_STACKS" tag="haxe"/>
+ <flag value='-DHXCPP_TRACY_NO_EXIT' if="HXCPP_TRACY_NO_EXIT" tag="haxe"/>
+ <flag value='-DHXCPP_TRACY_ON_DEMAND' if="HXCPP_TRACY_ON_DEMAND" tag="haxe"/>
 
  <mmflag value='-Wno-invalid-offsetof' />
  <mmflag value='-Wno-format-security' />

diff --git a/toolchain/haxe-target.xml b/toolchain/haxe-target.xml
@@ -137,6 +137,8 @@
   <depend files="hxcpp-depends"/>
   <options name="Options.txt"/>
   <compilerflag value="-DTRACY_ENABLE"/>
+  <compilerflag value="-DTRACY_NO_EXIT" if="HXCPP_TRACY_NO_EXIT"/>
+  <compilerflag value="-DTRACY_ON_DEMAND" if="HXCPP_TRACY_ON_DEMAND"/>
 
   <file name="project/thirdparty/tracy-0.11.1/TracyClient.cpp"/>
   <cache value="1" project="hxcpp-tracy" asLibrary="true" />