diff --git a/FlingEngine/Core/inc/Engine.h b/FlingEngine/Core/inc/Engine.h
index b5678aba..854dd50f 100644
--- a/FlingEngine/Core/inc/Engine.h
+++ b/FlingEngine/Core/inc/Engine.h
@@ -9,6 +9,7 @@
 #include "World.h"
 #include <nlohmann/json.hpp>
 #include <entt/entity/registry.hpp>
+#include <csignal>
 
 #include "MovingAverage.hpp"
 #include "Stats.h"
@@ -20,6 +21,20 @@
 
 #endif	// WITH_EDITOR
 
+/**
+ * Triggers a breakpoint at the call site, halting execution if a debugger is attached.
+ * Works across compilers/platforms so callers don't need their own #ifdef ladder.
+ */
+#if defined( _MSC_VER )
+	#define F_DEBUG_BREAK() __debugbreak()
+#elif defined( __clang__ )
+	#define F_DEBUG_BREAK() __builtin_debugtrap()
+#elif defined( __GNUC__ )
+	#define F_DEBUG_BREAK() raise( SIGTRAP )
+#else
+	#define F_DEBUG_BREAK()
+#endif
+
 namespace Fling
 {
 	/**
diff --git a/FlingEngine/Core/src/Engine.cpp b/FlingEngine/Core/src/Engine.cpp
index 9e30dab5..2c1d6d7a 100644
--- a/FlingEngine/Core/src/Engine.cpp
+++ b/FlingEngine/Core/src/Engine.cpp
@@ -20,6 +20,12 @@ namespace Fling
 
 		FlingConfig::Get().Init();
 
+		if (CommandLine::Get().GetValueAs<bool>("WaitForDebugger", false))
+		{
+			F_LOG_TRACE("-WaitForDebugger was set, breaking into the debugger now");
+			F_DEBUG_BREAK();
+		}
+
 		ResourceManager::Get().Init();
 		Timing::Get().Init();        
 		Input::Init();