I hate failed merges

[pazpar2-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index d9b0419..5bf4168 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -44,6 +44,12 @@ BINDIR=$(ROOTDIR)\bin       # We produce exes and dlls there
 WINDIR=$(ROOTDIR)\win       # all these Win make things
 SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 
+!if $(DEBUG)
+OBJDIR=$(WINDIR)\dobj
+!else
+OBJDIR=$(WINDIR)\obj
+!endif
+
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)