diff --git a/client.qc b/client.qc
index 32a1553..d822c7b 100644
--- a/client.qc
+++ b/client.qc
@@ -1829,6 +1829,9 @@ void(entity p) TeamFortress_SetSkin;
 
 void() PutClientInServer =
 {
+#ifdef MAP_DEBUG
+	local string st;
+#endif
 	local float iszoom, oldclass;
 	local entity spot, te;
 
diff --git a/makefile b/makefile
index c6ffade..08620ab 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 all: progs.src *.qc *.qh
-	qfcc --warn=error --advanced
+	qfcc --warn=error --advanced $(CFLAGS)
 debug: progs.src *.qc *.qh
-	qfcc --warn=all --code=debug --advanced -DDEBUG
+	qfcc --warn=all --code=debug --advanced -DDEBUG $(CFLAGS)
 clean:
 	rm -f core *.dat *.pqc *.sym progdefs.h