1 files changed, 17 insertions, 0 deletions
diff --git a/src/common.h b/src/common.h
index 138c326..7ccf015 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,6 +1,11 @@
 #pragma once
 #include <AFX.H>
+
+// a terrible, terrible kludge
+#ifndef DONT_INCLUDE_AFXTEMPL
 #include <AFXTEMPL.H>
+#endif
+
 #include <AFXWIN.H>
 #include <AFXCMN.H>
 #include <MBSTRING.H>
@@ -11,6 +16,15 @@
 #include <dinput.h>
 #include <math.h>
 
+#ifdef __clang__
+#undef AFX_CLASS_EXPORT
+#undef AFX_API_EXPORT
+#undef AFX_DATA_EXPORT
+#define AFX_CLASS_EXPORT
+#define AFX_API_EXPORT
+#define AFX_DATA_EXPORT
+#endif
+
 class CEditWFocus;
 class CFilePlugin;
 class CFilePluginList;
@@ -119,6 +133,7 @@ class T2PeopleArrayList;
 class T2PeopleAnimeDef;
 class T2PeopleAnimeDefElem;
 class T2PeopleDef;
+class T2PeopleDemandList;
 class T2PeoplePtrList;
 class T2PeopleTimeZoneList;
 class T2PeopleType;
@@ -313,6 +328,7 @@ enum {
 #define MSVC_STDCALL
 #endif
 
+#ifdef ATOI_KLUDGE
 // why is this necessary?
 inline int MSVC_STDCALL my_atoi(const char *s) {
 	int v = 0;
@@ -324,3 +340,4 @@ inline int MSVC_STDCALL my_atoi(const char *s) {
 }
 
 #define atoi my_atoi
+#endif