diff --git a/Makefile b/Makefile
index 98d75925d..00da29b32 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,10 @@ LIBS      = -lgdi32 -lwinmm -lpsapi -ldbghelp -lole32
 CC        = i686-w64-mingw32-gcc
 WINDRES  ?= i686-w64-mingw32-windres
 
+ifdef DEBUG
+	CFLAGS   += -D _DEBUG -D _DEBUG_X
+endif
+
 .PHONY: clean all
 all: $(TARGET)
 
diff --git a/build.cmd b/build.cmd
index 539995e7a..c9d3564b1 100644
--- a/build.cmd
+++ b/build.cmd
@@ -5,4 +5,5 @@ REM
 set PATH=C:\w64devkit\bin
 make clean
 make
+REM make DEBUG=1
 pause
diff --git a/src/hook.c b/src/hook.c
index d8f72a723..3a1b7cdda 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -646,12 +646,13 @@ void hook_exit()
 
         hook_revert((HOOKLIST*)&g_hook_hooklist);
 
-#if defined(_DEBUG) && defined(_MSC_VER)
+#if defined(_DEBUG)
+#if defined(_MSC_VER)
         DetourTransactionBegin();
         DetourUpdateThread(GetCurrentThread());
         DetourDetach((PVOID*)&real_SetUnhandledExceptionFilter, (PVOID)fake_SetUnhandledExceptionFilter);
         DetourTransactionCommit();
-
+#endif
         real_SetUnhandledExceptionFilter(g_dbg_exception_filter);
 #endif