From b22aea23b02126538846892da089e8b30ae09022 Mon Sep 17 00:00:00 2001
From: Michael Flaherty <michaelwflaherty@me.com>
Date: Mon, 22 Apr 2019 02:17:03 -0700
Subject: [PATCH] Fix Linux Builds

---
 extensions/dhooks/AMBuilder | 6 +++++-
 extensions/dhooks/vhook.h   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extensions/dhooks/AMBuilder b/extensions/dhooks/AMBuilder
index f945af0ec..4fcd5777f 100644
--- a/extensions/dhooks/AMBuilder
+++ b/extensions/dhooks/AMBuilder
@@ -10,6 +10,10 @@ for arch in SM.archs:
       os.path.join(builder.sourcePath, 'sourcepawn', 'vm'),
       os.path.join(builder.sourcePath, 'sourcepawn', 'vm', 'x86'),
   ]
+
+  if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang':
+    binary.compiler.cxxflags += ['-Wno-invalid-offsetof']
+
   binary.compiler.defines += ['META_NO_HL2SDK']
   binary.sources += [
     'extension.cpp',
@@ -21,4 +25,4 @@ for arch in SM.archs:
     os.path.join(builder.sourcePath, 'sourcepawn', 'vm', 'x86', 'assembler-x86.cpp'),
   ]
 
-  SM.extensions += [builder.Add(binary)]
\ No newline at end of file
+  SM.extensions += [builder.Add(binary)]
diff --git a/extensions/dhooks/vhook.h b/extensions/dhooks/vhook.h
index 5eaa1e62d..cc3054618 100644
--- a/extensions/dhooks/vhook.h
+++ b/extensions/dhooks/vhook.h
@@ -203,7 +203,7 @@ SourceHook::PassInfo::PassType GetParamTypePassType(HookParamType type);
 #ifndef  WIN32
 static void *GenerateThunk(ReturnType type)
 {
-	sp::MacroAssemblerX86 masm;
+	sp::MacroAssembler masm;
 	static const size_t kStackNeeded = (2) * 4; // 2 args max
 	static const size_t kReserve = ke::Align(kStackNeeded+8, 16)-8;