Some fixes to make idaclang a little bit happier

Author: brainiac

include/eqlib/Offsets.h

@@ -104,7 +104,15 @@ uintptr_t FixEQMainOffset(T nOffset)
 // FUNCTION_AT_ADDRESS macros
 //
 
-#if defined(_M_AMD64)
+#if defined(__clang__)
+
+#define FUNCTION_AT_ADDRESS(rettype, func, variable)
+#define FUNCTION_AT_VIRTUAL_ADDRESS(rettype, func, offset)
+#define FORWARD_FUNCTION_TO_VTABLE(rettype, function, Class, member)
+#define FORWARD_FUNCTION_TO_VTABLE2(a, b, c, d, e)
+#define FUNCTION_AT_VIRTUAL_TABLE_ADDRESS(rettype, function, address, offset)
+
+#elif defined(_M_AMD64)
 
 #define FUNCTION_AT_ADDRESS(rettype, func, variable)                                               \
 	FUNCTION_CHECKS_OFF()                                                                          \

include/eqlib/WindowOverride.h

@@ -134,6 +134,9 @@ class CXWndTrampoline : public Target
 	virtual void UpdateLayout(bool finish = false) override;
 };
 
+#ifdef __clang__
+#define IMPLEMENT_VTABLE_TRAMPOLINE(Orig, Class, RetType, Name, Signature)
+#else
 #define IMPLEMENT_VTABLE_TRAMPOLINE(Orig, Class, RetType, Name, Signature) \
 	template <typename Target>                                             \
 	__declspec(naked) RetType Class<Target>::Name Signature {              \
@@ -142,6 +145,7 @@ class CXWndTrampoline : public Target
 		__asm mov eax, [TargetT::s_originalVTable]                         \
 		__asm jmp dword ptr [eax]VFT.Name                                  \
 	}
+#endif
 
 IMPLEMENT_VTABLE_TRAMPOLINE(CXWnd, CXWndTrampoline, bool, IsValid, () const);
 IMPLEMENT_VTABLE_TRAMPOLINE(CXWnd, CXWndTrampoline, int, DrawNC, () const);

src/EQLibStatic.cpp

@@ -20,11 +20,11 @@
 
 #include "game/CXStr.cpp"
 #include "game/CXWnd.cpp"
+#include "game/Display.cpp"
 #include "game/EQClasses.cpp"
 #include "game/EverQuest.cpp"
 #include "game/FunctionDefs.cpp"
 #include "game/Globals.cpp"
-#include "game/GraphicsEngine.cpp"
 #include "game/ItemLinks.cpp"
 #include "game/Items.cpp"
 #include "game/PcClient.cpp"
@@ -36,3 +36,4 @@
 #include "game/UITemplates.cpp"
 #include "game/UITextures.cpp"
 #include "game/XMLData.cpp"
+#include "graphics/GraphicsEngine.cpp"