diff --git a/Makefile b/Makefile
index 8683020..d26b0b3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ INCDIR=include
 
 CXX=cl /nologo
 LD=link /nologo
-CXXFLAGS=/c /O1 /I$(INCDIR) /W4 /Zi /DWIN32_LEAN_AND_MEAN /DWINVER=0x0501 /D_WIN32_WINNT=0x0501 /wd4100 /DUNICODE /D_UNICODE /EHsc
-LDFLAGS=/subsystem:windows /debug /incremental:no /opt:REF
+CXXFLAGS=/c /O1 /I$(INCDIR) /W4 /DWIN32_LEAN_AND_MEAN /DWINVER=0x0501 /D_WIN32_WINNT=0x0501 /wd4100 /DUNICODE /D_UNICODE /EHsc
+LDFLAGS=/subsystem:windows /incremental:no /opt:REF
 RC=rc /nologo
 RCFLAGS=/i$(INCDIR)
 LIBS=
@@ -12,10 +12,13 @@ LIBS=
 !IFDEF DEBUG
 BUILD=Debug
 CXXFLAGS=$(CXXFLAGS) /DDEBUG
-LDFLAGS=$(LDFLAGS)
 !ELSE
 BUILD=Release
-LDFLAGS=$(LDFLAGS)
+!ENDIF
+
+!IFNDEF NOPDB
+CXXFLAGS=$(CXXFLAGS) /Zi
+LDFLAGS=$(LDFLAGS) /debug
 !ENDIF
 
 OUTDIR=build\$(BUILD)