Daniel/desktop/master backport feb 2026

VortexEngine/src/Memory/Memory.cpp

@@ -117,7 +117,7 @@ uint32_t cur_memory_usage_total()
 
 #endif // DEBUG_ALLOCATIONS == 1
 
-#ifndef VORTEX_LIB
+#if CPP_MEMORY_OPERATORS == 1
 
 // for C++11 need the following:
 void *operator new  (size_t size) { return vmalloc(size); }

VortexEngine/src/Memory/Memory.h

@@ -36,7 +36,8 @@ uint32_t cur_memory_usage_total();
 
 #endif
 
-#ifndef VORTEX_LIB
+#if CPP_MEMORY_OPERATORS == 1
+
 void *operator new  (size_t size);
 void *operator new[](size_t size);
 void  operator delete  (void *ptr);
@@ -51,6 +52,7 @@ void  operator delete[](void *ptr, size_t size) noexcept;
 //void  operator delete[](void *ptr, std::align_val_t al) noexcept;
 //void  operator delete  (void *ptr, size_t size, std::align_val_t al) noexcept;
 //void  operator delete[](void *ptr, size_t size, std::align_val_t al) noexcept;
+
 #endif
 
 #endif

VortexEngine/src/Menus/Menu.h

@@ -16,7 +16,7 @@ class Menu
   virtual bool init();
 
   // the action for the menu to execute
-  enum MenuAction :uint8_t {
+  enum MenuAction : uint8_t {
     // quit the menus
     MENU_QUIT,
     // continue running the menu