Build extension against new TF2 sdk, add safetyhook as detour backend (#63)

Author: Kenzzer

.github/workflows/ci-extension.yml

@@ -35,15 +35,16 @@ jobs:
       # We currently only support tf2 - however when we support more sdks
       # we will have to deal with the special case of our custom tf2 + AM's sdks
       SDKS: '["tf2"]'
-      MMSOURCE_VERSION: '1.10'
-      SOURCEMOD_VERSION: '1.11'
+      MMSOURCE_VERSION: '1.11'
+      SOURCEMOD_VERSION: '1.12'
       CACHE_PATH: ${{ github.workspace }}/cache
     steps:
 
       - uses: actions/checkout@v4
         name: Repository checkout
         with:
           fetch-depth: 0
+          submodules: true
           path: CBaseNPC
 
       - uses: actions/checkout@v4
@@ -71,7 +72,7 @@ jobs:
       - uses: actions/checkout@v4
         name: Custom TF2 SDK checkout
         with:
-          repository: TF2-DMB/hl2sdk-tf2
+          repository: alliedmodders/hl2sdk
           ref: tf2
           path: cache/hl2sdk-tf2
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "third_party/safetyhook"]
+	path = third_party/safetyhook
+	url = [email protected]:alliedmodders/safetyhook.git

AMBuildScript

@@ -99,6 +99,7 @@ class ExtensionConfig(object):
     self.smapi_path = None
     self.all_targets = []
     self.target_archs = set()
+    self.libsafetyhook = {}
 
     if self.build_extension():
       if builder.options.targets:
@@ -265,8 +266,6 @@ class ExtensionConfig(object):
     # Platform-specifics
     if cxx.target.platform == 'linux':
       self.configure_linux(cxx)
-    elif cxx.target.platform == 'mac':
-      self.configure_mac(cxx)
     elif cxx.target.platform == 'windows':
       self.configure_windows(cxx)
 
@@ -283,10 +282,6 @@ class ExtensionConfig(object):
 
   def configure_gcc(self, cxx):
     cxx.defines += [
-      'stricmp=strcasecmp',
-      '_stricmp=strcasecmp',
-      '_snprintf=snprintf',
-      '_vsnprintf=vsnprintf',
       'typeof=__typeof__',
       'HAVE_STDINT_H',
       'GNUC',
@@ -299,8 +294,9 @@ class ExtensionConfig(object):
       '-Wno-unused',
       '-Wno-switch',
       '-Wno-array-bounds',
+      '-Wno-implicit-exception-spec-mismatch',
+      '-Wno-dangling-else',
       '-msse',
-      '-m32',
       '-fvisibility=hidden',
     ]
     cxx.cxxflags += [
@@ -387,7 +383,7 @@ class ExtensionConfig(object):
     ]
 
     if builder.options.opt == '1':
-      cxx.cflags += ['/Ox', '/Zo', '-O3']
+      cxx.cflags += ['/Ox', '/Zo']
       cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
 
     if builder.options.debug == '1':
@@ -398,28 +394,28 @@ class ExtensionConfig(object):
     cxx.cflags += ['/Oy-']
 
   def configure_linux(self, cxx):
-    cxx.defines += ['_LINUX', 'POSIX']
+    cxx.defines += ['_LINUX', 'POSIX', 'LINUX']
     cxx.linkflags += ['-Wl,--exclude-libs,ALL', '-lm']
     if cxx.vendor == 'gcc':
       cxx.linkflags += ['-static-libgcc']
     elif cxx.vendor == 'clang':
       cxx.linkflags += ['-lgcc_eh']
     cxx.linkflags += ['-static-libstdc++']
-
-  def configure_mac(self, cxx):
-    cxx.defines += ['OSX', '_OSX', 'POSIX']
-    cxx.cflags += ['-mmacosx-version-min=10.7']
-    cxx.linkflags += [
-      '-mmacosx-version-min=10.7',
-      '-arch', 'i386',
-      '-lstdc++',
-      '-stdlib=libstdc++',
-    ]
-    cxx.cxxflags += ['-stdlib=libstdc++']
+    cxx.cflags += ["-march=pentium4", "-march=core2", "-msse2", "-mfpmath=sse"]
 
   def configure_windows(self, cxx):
     cxx.defines += ['WIN32', '_WINDOWS']
 
+  def AddCDetour(self, binary):
+    binary.sources += [ os.path.join(self.sm_root, 'public', 'CDetour', 'detours.cpp') ]
+    binary.compiler.cxxincludes += [ os.path.join(builder.sourcePath, 'third_party', 'safetyhook', 'include') ]
+
+    for task in self.libsafetyhook:
+      if task.target.arch == binary.compiler.target.arch:
+        binary.compiler.linkflags += [task.binary]
+        return
+    raise Exception('No suitable build of safetyhook was found.')
+
   def ConfigureForExtension(self, context, compiler):
     compiler.cxxincludes += [
       os.path.join(context.currentSourcePath),
@@ -464,13 +460,6 @@ class ExtensionConfig(object):
 
     compiler.defines += ['SOURCE_ENGINE=' + sdk.code]
 
-    if sdk.name in ['tf2', 'sdk2013', 'bms'] and compiler.like('gcc'):
-      # The 2013 SDK already has these in public/tier0/basetypes.h
-      compiler.defines.remove('stricmp=strcasecmp')
-      compiler.defines.remove('_stricmp=strcasecmp')
-      compiler.defines.remove('_snprintf=snprintf')
-      compiler.defines.remove('_vsnprintf=vsnprintf')
-
     if compiler.like('msvc'):
       compiler.defines += ['COMPILER_MSVC']
       if compiler.target.arch == 'x86':
@@ -509,7 +498,7 @@ class ExtensionConfig(object):
       elif compiler.target.arch == 'x86_64':
         lib_folder = os.path.join(sdk.path, 'lib', 'linux64')
       else:
-        lib_folder = os.path.join(sdk.path, 'lib', 'linux')
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux')
     elif compiler.target.platform == 'mac':
       if sdk.name in ['sdk2013', 'bms']:
         lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
@@ -555,9 +544,9 @@ class ExtensionConfig(object):
         libs.append('interfaces')
       for lib in libs:
         if compiler.target.arch == 'x86':
-          lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
+          lib_path = os.path.join(sdk.path, 'lib', 'public', 'x86', lib) + '.lib'
         elif compiler.target.arch == 'x86_64':
-          lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
+          lib_path = os.path.join(sdk.path, 'lib', 'public', 'x64', lib) + '.lib'
         compiler.linkflags.append(lib_path)
 
     for library in dynamic_libs:
@@ -617,6 +606,17 @@ if Extension.build_extension():
   Extension.detectSDKs()
 Extension.configure()
 
+class SafetyHookShim(object):
+  def __init__(self):
+    self.all_targets = {}
+    self.libsafetyhook = {}
+
+if Extension.build_extension():
+  SafetyHook = SafetyHookShim()
+  SafetyHook.all_targets = Extension.all_targets
+  builder.Build(os.path.join('third_party/safetyhook/AMBuilder'), {'SafetyHook': SafetyHook })
+  Extension.libsafetyhook = SafetyHook.libsafetyhook
+
 if Extension.use_auto_versioning():
   Extension.generated_headers = builder.Build(
     'tools/Versioning',

extension/AMBuilder

@@ -12,8 +12,6 @@ project.sources = [
   'pluginentityfactory.cpp',
   'toolsnav_mesh.cpp',
   'toolsnextbot.cpp',
-  'CDetour/detours.cpp',
-  'asm/asm.c',
   'helpers.cpp',
   'sourcesdk/NextBot/Path/NextBotPath.cpp',
   'sourcesdk/NextBot/Path/NextBotPathFollow.cpp',
@@ -69,7 +67,7 @@ project.sources = [
   'natives/nextbotplayer.cpp',
   'natives/tf/nav.cpp',
   'natives/tf/nav/area.cpp',
-  'smsdk_ext.cpp'
+  os.path.join(Extension.sm_root, 'public', 'smsdk_ext.cpp')
 ]
 
 for sdk_name in Extension.sdks:
@@ -80,6 +78,7 @@ for sdk_name in Extension.sdks:
       continue
 
     binary = Extension.HL2ExtConfig(project, builder, cxx, 'cbasenpc.ext.' + sdk.ext, sdk)
+    Extension.AddCDetour(binary)
     binary.compiler.cxxincludes += [
       os.path.join(builder.currentSourcePath, 'sourcesdk'),
       os.path.join(builder.currentSourcePath, 'sourcesdk/NextBot'),