-INCLUDES = -I../../Common/rt\ api -I../../Server\ Applications/rsearchi
-# XXX todo currently only 32-bit targets work
-CFLAGS = -Wall -m32 -std=c++98 $(INCLUDES) $(OPTIMIZATION) -c
-LFLAGS = -Wall -m32 -std=c++98 $(INCLUDES) $(OPTIMIZATION)
+INCLUDES = -I../../Common/rt\ api
+CFLAGS = -Wall -ansi $(INCLUDES) $(OPTIMIZATION) -c $(DEBUG)
+LFLAGS = -Wall -ansi $(INCLUDES) $(OPTIMIZATION) $(DEBUG)