* Add ZeroMemory hack to compile mmanager.cpp.

 * Remove some unused CFLAGS.

diff --git a/ABM2/Makefile b/ABM2/Makefile
index f6dc710b63638d7126c46e38d5edfcf31a8b4f79..900434e0efd73d132fea2a3fc3e6ca0956e0535f 100644 (file)
--- a/ABM2/Makefile
+++ b/ABM2/Makefile
@@ -1,5 +1,5 @@
-CFLAGS:=-I. -fno-elide-constructors -fms-extensions -fpermissive
-OBJS:=main.o Engine/Log.o SchemeReader.o Engine/Settings.o
+CFLAGS:=-I.
+OBJS:=main.o Engine/Log.o SchemeReader.o Engine/Settings.o Engine/mmanager.o
 
 all: $(OBJS)
 

diff --git a/ABM2/porting.h b/ABM2/porting.h
index 942acab36114e302b3c44aca8c89b25965f8a5f8..3ad233031284628127cdf9aeea6df26805207e56 100644 (file)
--- a/ABM2/porting.h
+++ b/ABM2/porting.h
@@ -1,4 +1,5 @@
 #ifndef WIN32
        #define vsprintf_s vsnprintf
        #define sprintf_s snprintf
+       #define ZeroMemory(buf, size) memset(buf, 0, size)
 #endif // !WIN32