Convert MM:S hybrid plugin to SM extension

AMBuildScript

@@ -1,5 +1,8 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os, sys
 
+# Simple extensions do not need to modify this file.
+
 class SDK(object):
   def __init__(self, sdk, ext, aDef, name, platform, dir):
     self.folder = 'hl2sdk-' + dir
@@ -7,38 +10,36 @@ class SDK(object):
     self.ext = ext
     self.code = aDef
     self.define = name
+    self.platform = platform
     self.name = dir
     self.path = None # Actual path
-    self.platformSpec = platform
-
-    # By default, nothing supports x64.
-    if type(platform) is list:
-      self.platformSpec = {p: ['x86'] for p in platform}
-    else:
-      self.platformSpec = platform
-
-  def shouldBuild(self, target, archs):
-    if target.platform not in self.platformSpec:
-      return False
-    if not len([i for i in self.platformSpec[target.platform] if i in archs]):
-      return False
-    return True
 
 WinOnly = ['windows']
 WinLinux = ['windows', 'linux']
 WinLinuxMac = ['windows', 'linux', 'mac']
-CSGO = {
-  'windows': ['x86'],
-  'linux': ['x86', 'x64'],
-  'mac': ['x64']
-}
-Source2 = {
-  'windows': ['x86', 'x64'],
-  'linux': ['x64'],
-}
 
 PossibleSDKs = {
+  'episode1':  SDK('HL2SDK', '1.ep1', '1', 'EPISODEONE', WinLinux, 'episode1'),
+  'ep2':  SDK('HL2SDKOB', '2.ep2', '3', 'ORANGEBOX', WinLinux, 'orangebox'),
+  'css':  SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'),
+  'hl2dm':  SDK('HL2SDKHL2DM', '2.hl2dm', '7', 'HL2DM', WinLinuxMac, 'hl2dm'),
+  'dods': SDK('HL2SDKDODS', '2.dods', '8', 'DODS', WinLinuxMac, 'dods'),
+  'sdk2013': SDK('HL2SDK2013', '2.sdk2013', '9', 'SDK2013', WinLinuxMac, 'sdk2013'),
   'tf2':  SDK('HL2SDKTF2', '2.tf2', '11', 'TF2', WinLinuxMac, 'tf2'),
+  'l4d':  SDK('HL2SDKL4D', '2.l4d', '12', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
+  'nucleardawn': SDK('HL2SDKND', '2.nd', '13', 'NUCLEARDAWN', WinLinuxMac, 'nucleardawn'),
+  'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '15', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
+  'darkm':  SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
+  'swarm':  SDK('HL2SDK-SWARM', '2.swarm', '16', 'ALIENSWARM', WinOnly, 'swarm'),
+  'bgt':  SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
+  'eye':  SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
+  'csgo': SDK('HL2SDKCSGO', '2.csgo', '21', 'CSGO', WinLinuxMac, 'csgo'),
+  'portal2':  SDK('HL2SDKPORTAL2', '2.portal2', '17', 'PORTAL2', [], 'portal2'),
+  'blade':  SDK('HL2SDKBLADE', '2.blade', '18', 'BLADE', WinLinux, 'blade'),
+  'insurgency':  SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'),
+  'contagion':  SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'),
+  'bms':  SDK('HL2SDKBMS', '2.bms', '10', 'BMS', WinLinux, 'bms'),
+  'doi':  SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'),
 }
 
 def ResolveEnvPath(env, folder):
@@ -46,71 +47,45 @@ def ResolveEnvPath(env, folder):
     path = os.environ[env]
     if os.path.isdir(path):
       return path
-  else:
-    head = os.getcwd()
-    oldhead = None
-    while head != None and head != oldhead:
-      path = os.path.join(head, folder)
-      if os.path.isdir(path):
-        return path
-      oldhead = head
-      head, tail = os.path.split(head)
+    return None
+
+  head = os.getcwd()
+  oldhead = None
+  while head != None and head != oldhead:
+    path = os.path.join(head, folder)
+    if os.path.isdir(path):
+      return path
+    oldhead = head
+    head, tail = os.path.split(head)
+
   return None
 
-def SetArchFlags(compiler, arch, platform):
-  if compiler.behavior == 'gcc':
-    if arch == 'x86':
-      compiler.cflags += ['-m32']
-      compiler.linkflags += ['-m32']
-      if platform == 'mac':
-        compiler.linkflags += ['-arch', 'i386']
-    elif arch == 'x64':
-      compiler.cflags += ['-m64', '-fPIC']
-      compiler.linkflags += ['-m64']
-      if platform == 'mac':
-        compiler.linkflags += ['-arch', 'x86_64']
-  elif compiler.like('msvc'):
-    if arch == 'x86':
-      compiler.linkflags += ['/MACHINE:X86']
-    elif arch == 'x64':
-      compiler.linkflags += ['/MACHINE:X64']
-
-def AppendArchSuffix(binary, name, arch):
-  if arch == 'x64':
-    binary.localFolder = name + '.x64'
-
-class MMSConfig(object):
+def Normalize(path):
+  return os.path.abspath(os.path.normpath(path))
+
+class ExtensionConfig(object):
   def __init__(self):
     self.sdks = {}
     self.binaries = []
+    self.extensions = []
     self.generated_headers = None
-    self.archs = builder.target.arch.replace('x86_64', 'x64').split(',')
-    self.sm_path = builder.options.sm_path or None
-
-  def detectProductVersion(self):
-    builder.AddConfigureFile('product.version')
-
-    # For OS X dylib versioning
-    import re
-    with open(os.path.join(builder.sourcePath, 'product.version'), 'r') as fp:
-      productContents = fp.read()
-    m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents)
-    if m == None:
-      self.productVersion = '1.0.0'
-    else:
-      major, minor, release = m.groups()
-      self.productVersion = '{0}.{1}.{2}'.format(major, minor, release)
+    self.mms_root = None
+    self.sm_root = None
+
+  @property
+  def tag(self):
+    if builder.options.debug == '1':
+      return 'Debug'
+    return 'Release'
 
   def detectSDKs(self):
     sdk_list = builder.options.sdks.split(',')
     use_all = sdk_list[0] == 'all'
     use_present = sdk_list[0] == 'present'
-    if sdk_list[0] == '':
-        sdk_list = []
 
     for sdk_name in PossibleSDKs:
       sdk = PossibleSDKs[sdk_name]
-      if sdk.shouldBuild(builder.target, self.archs):
+      if builder.target_platform in sdk.platform:
         if builder.options.hl2sdk_root:
           sdk_path = os.path.join(builder.options.hl2sdk_root, sdk.folder)
         else:
@@ -120,150 +95,236 @@ class MMSConfig(object):
             raise Exception('Could not find a valid path for {0}'.format(sdk.envvar))
           continue
         if use_all or use_present or sdk_name in sdk_list:
-          sdk.path = sdk_path
+          sdk.path = Normalize(sdk_path)
           self.sdks[sdk_name] = sdk
 
-    if len(self.sdks) < 1 and len(sdk_list):
-      raise Exception('No SDKs were found that build on {0}-{1}, nothing to do.'.format(
-        builder.target.platform, builder.target.arch))
+    if len(self.sdks) < 1:
+      raise Exception('At least one SDK must be available.')
+
+    if builder.options.sm_path:
+      self.sm_root = builder.options.sm_path
+    else:
+      self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.8')
+      if not self.sm_root:
+        self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod')
+      if not self.sm_root:
+        self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod-central')
+
+    if not self.sm_root or not os.path.isdir(self.sm_root):
+      raise Exception('Could not find a source copy of SourceMod')
+    self.sm_root = Normalize(self.sm_root)
+
+    if builder.options.mms_path:
+      self.mms_root = builder.options.mms_path
+    else:
+      self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
+      if not self.mms_root:
+        self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central')
+
+    if not self.mms_root or not os.path.isdir(self.mms_root):
+      raise Exception('Could not find a source copy of Metamod:Source')
+    self.mms_root = Normalize(self.mms_root)
 
   def configure(self):
-    if not set(self.archs).issubset(['x86', 'x64']):
-      raise Exception('Unknown target architecture: {0}'.format(builder.target.arch))
-
-    cxx = builder.DetectCxx()
-
-    if cxx.like('msvc') and len(self.archs) > 1:
-      raise Exception('Building multiple archs with MSVC is not currently supported')
-
-    if cxx.behavior == 'gcc':
-      cxx.defines += [
-        'stricmp=strcasecmp',
-        '_stricmp=strcasecmp',
-        '_snprintf=snprintf',
-        '_vsnprintf=vsnprintf',
-        '_alloca=alloca',
-        'GNUC'
-      ]
-      cxx.cflags += [ # todo: what is the difference between cflags and cxxflags
-        '-fPIC',
-        '-fno-exceptions',
-        '-fno-rtti',
-        '-msse',
-        '-fno-strict-aliasing',
-      ]
-
-      if (cxx.version >= 'gcc-4.0') or cxx.family == 'clang':
-        cxx.cflags += [
-          '-fvisibility=hidden',
-          '-fvisibility-inlines-hidden',
-          '-std=c++11',
-        ]
-      # apple clang <-> llvm clang version correspondence is just a guess as there is no way to figure it out for real
-      if (cxx.version >= 'gcc-4.7' or cxx.version >= 'clang-3.0' or cxx.version >= 'apple-clang-5.1'):
-        cxx.cflags += [
-          '-Wno-delete-non-virtual-dtor',
-          '-Wno-unused-private-field',
-          '-Wno-deprecated-register',
-        ]
-      if cxx.family == 'clang':
-        if cxx.version >= 'clang-3.9' or cxx.version >= 'apple-clang-10.0':
-          cxx.cxxflags += ['-Wno-expansion-to-defined']
-
-    elif cxx.like('msvc'):
-      # raise Exception('MSVC builds should use the Visual Studio projects until somebody implements support') # todo: implement MSVC support
-      if builder.options.debug == '1':
-        cxx.cflags += ['/MTd']
-        cxx.linkflags += ['/NODEFAULTLIB:libcmt']
-      else:
-        cxx.cflags += ['/MT']
-      cxx.defines += [
-        '_CRT_SECURE_NO_DEPRECATE',
-        '_CRT_SECURE_NO_WARNINGS',
-        '_CRT_NONSTDC_NO_DEPRECATE',
-        '_ITERATOR_DEBUG_LEVEL=0',
-        'WIN32',
-        '_WINDOWS'
-      ]
-      cxx.cflags += [
-        '/W3',
-      ]
-      cxx.cxxflags += [
-        '/EHsc',
-        '/GR-',
-        '/TP',
-      ]
-      cxx.linkflags += [
-        '/MACHINE:X86',
-      ]
+    cxx = builder.DetectCompilers()
+
+    if cxx.like('gcc'):
+      self.configure_gcc(cxx)
+    elif cxx.vendor == 'msvc':
+      self.configure_msvc(cxx)
 
     # Optimization
     if builder.options.opt == '1':
-      if cxx.behavior == 'gcc':
-        cxx.cflags += proj_c_flags_opt
-      # elif cxx.behavior == 'msvc': # todo: implement MSVC support
+      cxx.defines += ['NDEBUG']
 
     # Debugging
     if builder.options.debug == '1':
-      cxx.defines += ['_DEBUG']
-      if cxx.behavior == 'gcc':
-        cxx.cflags += proj_c_flags_dbg
-      # elif cxx.behavior == 'msvc': # todo: implement MSVC support
+      cxx.defines += ['DEBUG', '_DEBUG']
+
+    # Platform-specifics
+    if builder.target_platform == 'linux':
+      self.configure_linux(cxx)
+    elif builder.target_platform == 'mac':
+      self.configure_mac(cxx)
+    elif builder.target_platform == 'windows':
+      self.configure_windows(cxx)
+
+    # Finish up.
+    cxx.includes += [
+      os.path.join(self.sm_root, 'public'),
+    ]
+
+  def configure_gcc(self, cxx):
+    cxx.defines += [
+      'stricmp=strcasecmp',
+      '_stricmp=strcasecmp',
+      '_snprintf=snprintf',
+      '_vsnprintf=vsnprintf',
+      'HAVE_STDINT_H',
+      'GNUC',
+    ]
+    cxx.cflags += [
+      '-pipe',
+      '-fno-strict-aliasing',
+      '-Wall',
+      '-Werror',
+      '-Wno-unused',
+      '-Wno-switch',
+      '-Wno-array-bounds',
+      '-msse',
+      '-m32',
+      '-fvisibility=hidden',
+    ]
+    cxx.cxxflags += [
+      '-std=c++14',
+      '-fno-exceptions',
+      '-fno-threadsafe-statics',
+      '-Wno-non-virtual-dtor',
+      '-Wno-overloaded-virtual',
+      '-fvisibility-inlines-hidden',
+    ]
+    cxx.linkflags += ['-m32']
+
+    have_gcc = cxx.vendor == 'gcc'
+    have_clang = cxx.vendor == 'clang'
+    if cxx.version >= 'clang-3.6':
+      cxx.cxxflags += ['-Wno-inconsistent-missing-override']
+    if have_clang or (cxx.version >= 'gcc-4.6'):
+      cxx.cflags += ['-Wno-narrowing']
+    if have_clang or (cxx.version >= 'gcc-4.7'):
+      cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
+    if cxx.version >= 'gcc-4.8':
+      cxx.cflags += ['-Wno-unused-result']
+
+    if have_clang:
+      cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
+      if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
+        cxx.cxxflags += ['-Wno-deprecated-register']
+      else:
+        cxx.cxxflags += ['-Wno-deprecated']
+      cxx.cflags += ['-Wno-sometimes-uninitialized']
+
+    if have_gcc:
+      cxx.cflags += ['-mfpmath=sse']
+
+    if builder.options.opt == '1':
+      cxx.cflags += ['-O3']
+
+  def configure_msvc(self, cxx):
+    if builder.options.debug == '1':
+      cxx.cflags += ['/MTd']
+      cxx.linkflags += ['/NODEFAULTLIB:libcmt']
+    else:
+      cxx.cflags += ['/MT']
+    cxx.defines += [
+      '_CRT_SECURE_NO_DEPRECATE',
+      '_CRT_SECURE_NO_WARNINGS',
+      '_CRT_NONSTDC_NO_DEPRECATE',
+      '_ITERATOR_DEBUG_LEVEL=0',
+    ]
+    cxx.cflags += [
+      '/W3',
+    ]
+    cxx.cxxflags += [
+      '/EHsc',
+      '/GR-',
+      '/TP',
+    ]
+    cxx.linkflags += [
+      '/MACHINE:X86',
+      'kernel32.lib',
+      'user32.lib',
+      'gdi32.lib',
+      'winspool.lib',
+      'comdlg32.lib',
+      'advapi32.lib',
+      'shell32.lib',
+      'ole32.lib',
+      'oleaut32.lib',
+      'uuid.lib',
+      'odbc32.lib',
+      'odbccp32.lib',
+    ]
+
+    if builder.options.opt == '1':
+      cxx.cflags += ['/Ox', '/Zo']
+      cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
+
+    if builder.options.debug == '1':
+      cxx.cflags += ['/Od', '/RTC1']
 
     # This needs to be after our optimization flags which could otherwise disable it.
-    # if cxx.family == 'msvc': # todo: implement MSVC support
+    # Don't omit the frame pointer.
+    cxx.cflags += ['/Oy-']
+
+  def configure_linux(self, cxx):
+    cxx.defines += ['_LINUX', 'POSIX']
+    cxx.linkflags += ['-Wl,--exclude-libs,ALL', '-lm']
+    if cxx.vendor == 'gcc':
+      cxx.linkflags += ['-static-libgcc']
+    elif cxx.vendor == 'clang':
+      cxx.linkflags += ['-lgcc_eh']
+
+  def configure_mac(self, cxx):
+    cxx.defines += ['OSX', '_OSX', 'POSIX']
+    cxx.cflags += ['-mmacosx-version-min=10.5']
+    cxx.linkflags += [
+      '-mmacosx-version-min=10.5',
+      '-arch', 'i386',
+      '-lstdc++',
+      '-stdlib=libstdc++',
+    ]
+    cxx.cxxflags += ['-stdlib=libstdc++']
 
-    # Platform-specifics
-    if builder.target.platform == 'linux':
-      cxx.defines += [
-        'POSIX',
-        '_LINUX',
-      ]
-      cxx.linkflags += ['-shared', '-lelf']
-      if cxx.family == 'gcc':
-        cxx.linkflags += ['-static-libgcc']
-    elif builder.target.platform == 'mac':
-      cxx.defines += [
-        'POSIX',
-        'OSX',
-        '_OSX',
-      ]
-      cxx.cflags += ['-mmacosx-version-min=10.9']
-      cxx.linkflags += [
-        '-dynamiclib',
-        '-lc++',
-        '-mmacosx-version-min=10.9',
-      ]
-    # elif builder.target.platform == 'windows': # todo: implement MSVC support
-
-  def HL2Compiler(self, context, sdk, arch):
-    compiler = context.cxx.clone()
+  def configure_windows(self, cxx):
+    cxx.defines += ['WIN32', '_WINDOWS']
+	
+  def ConfigureForExtension(self, context, compiler):
     compiler.cxxincludes += [
       os.path.join(context.currentSourcePath),
+      os.path.join(context.currentSourcePath, 'sdk'),
+      os.path.join(self.sm_root, 'public'),
+      os.path.join(self.sm_root, 'public', 'extensions'),
+      os.path.join(self.sm_root, 'sourcepawn', 'include'),
+      os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
+      os.path.join(self.sm_root, 'public', 'amtl'),
+    ]
+    return compiler
+
+  def ConfigureForHL2(self, binary, sdk):
+    compiler = binary.compiler
+
+    if sdk.name == 'episode1':
+      mms_path = os.path.join(self.mms_root, 'core-legacy')
+    else:
+      mms_path = os.path.join(self.mms_root, 'core')
+
+    compiler.cxxincludes += [
+      os.path.join(mms_path),
+      os.path.join(mms_path, 'sourcehook'),
     ]
 
     defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs]
     compiler.defines += defines
-    paths = [
-              ['public'],
-              ['public', 'engine'],
-              ['public', 'mathlib'],
-              ['public', 'vstdlib'],
-              ['public', 'tier0'],
-              ['public', 'tier1'],
-            ]
-
-    if not builder.options.mms_path:
-      raise Exception('Metamod:Source path is missing. Supply a --mms_path flag')
 
+    paths = [
+      ['public'],
+      ['public', 'engine'],
+      ['public', 'mathlib'],
+      ['public', 'vstdlib'],
+      ['public', 'tier0'],
+      ['public', 'tier1']
+    ]
     if sdk.name == 'episode1' or sdk.name == 'darkm':
       paths.append(['public', 'dlls'])
-      compiler.cxxincludes.append(os.path.join(builder.options.mms_path, 'core-legacy'))
-      compiler.cxxincludes.append(os.path.join(builder.options.mms_path, 'core-legacy', 'sourcehook'))
+      paths.append(['game_shared'])
     else:
       paths.append(['public', 'game', 'server'])
-      compiler.cxxincludes.append(os.path.join(builder.options.mms_path, 'core'))
-      compiler.cxxincludes.append(os.path.join(builder.options.mms_path, 'core', 'sourcehook'))
+      paths.append(['public', 'toolframework'])
+      paths.append(['game', 'shared'])
+      paths.append(['common'])
 
     compiler.defines += ['SOURCE_ENGINE=' + sdk.code]
 
@@ -274,126 +335,73 @@ class MMSConfig(object):
       compiler.defines.remove('_snprintf=snprintf')
       compiler.defines.remove('_vsnprintf=vsnprintf')
 
-    if compiler.family == 'msvc':
-      # todo: verify this for MSVC support
-      compiler.defines += ['COMPILER_MSVC']
-      if arch == 'x86':
-        compiler.defines += ['COMPILER_MSVC32']
-      elif arch == 'x64':
-        compiler.defines += ['COMPILER_MSVC64']
-
-      if compiler.version >= 1900:
-        compiler.linkflags += ['legacy_stdio_definitions.lib']
-    else: # todo: is it better to check compiler.behavior?
+    if compiler.like('msvc'):
+      compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32']
+      compiler.linkflags += ['legacy_stdio_definitions.lib']
+    else:
       compiler.defines += ['COMPILER_GCC']
 
-    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota', 'pvkii']:
-      if builder.target.platform in ['linux', 'mac']:
+    # For everything after Swarm, this needs to be defined for entity networking
+    # to work properly with sendprop value changes.
+    if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']:
+      compiler.defines += ['NETWORK_VARS_ENABLED']
+
+    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2']:
+      if builder.target_platform in ['linux', 'mac']:
         compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
 
-    if not builder.options.sm_path:
-      raise Exception('SourceMod path is missing. Supply a --sm_path flag')
-    paths.extend([
-      [ builder.options.sm_path, 'public' ],
-      [ builder.options.sm_path, 'public', 'amtl' ],
-      [ builder.options.sm_path, 'public', 'amtl', 'amtl' ],
-      [ builder.options.sm_path, 'sourcepawn', 'include' ],
-    ])
+    if sdk.name == 'csgo' and builder.target_platform == 'linux':
+      compiler.linkflags += ['-lstdc++']
 
     for path in paths:
       compiler.cxxincludes += [os.path.join(sdk.path, *path)]
 
-    return compiler
-
-  def AddVersioning(self, binary, arch):
-    if builder.target.platform == 'windows':
-      # todo: verify this for MSVC support
-      # binary.sources += ['version.rc']
-      # binary.compiler.rcdefines += [
-      #   'BINARY_NAME="{0}"'.format(binary.outputFile),
-      #   'RC_COMPILE'
-      # ]
-      pass
-    elif builder.target.platform == 'mac' and binary.type == 'library':
-      binary.compiler.postlink += [
-        '-compatibility_version', '1.0.0',
-        '-current_version', self.productVersion
-      ]
-
-    return binary
-
-  def LibraryBuilder(self, compiler, name, arch):
-    binary = compiler.Library(name)
-    AppendArchSuffix(binary, name, arch)
-    self.AddVersioning(binary, arch)
-    return binary
-
-  def HL2Library(self, context, name, sdk, arch):
-    compiler = self.HL2Compiler(context, sdk, arch)
-
-    SetArchFlags(compiler, arch, builder.target.platform)
-
-    if builder.target.platform == 'linux':
+    if builder.target_platform == 'linux':
       if sdk.name == 'episode1':
         lib_folder = os.path.join(sdk.path, 'linux_sdk')
       elif sdk.name in ['sdk2013', 'bms']:
         lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
-      elif arch == 'x64':
-        lib_folder = os.path.join(sdk.path, 'lib', 'linux64')
       else:
         lib_folder = os.path.join(sdk.path, 'lib', 'linux')
-    elif builder.target.platform == 'mac':
+    elif builder.target_platform == 'mac':
       if sdk.name in ['sdk2013', 'bms']:
         lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
-      elif arch == 'x64':
-        lib_folder = os.path.join(sdk.path, 'lib', 'osx64')
       else:
         lib_folder = os.path.join(sdk.path, 'lib', 'mac')
 
-    if builder.target.platform in ['linux', 'mac']:
-      if sdk.name in ['sdk2013', 'bms'] or arch == 'x64':
-        compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1.a'))]
+    if builder.target_platform in ['linux', 'mac']:
+      if sdk.name in ['sdk2013', 'bms']:
+        compiler.postlink += [
+          compiler.Dep(os.path.join(lib_folder, 'tier1.a')),
+          compiler.Dep(os.path.join(lib_folder, 'mathlib.a'))
+        ]
       else:
-        compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a'))]
-
-      if sdk.name in ['blade', 'insurgency', 'doi', 'csgo', 'dota']:
-        if arch == 'x64':
-          compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces.a'))]
-        else:
-          compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
-
-      if sdk.name == 'bms':
-        compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'mathlib.a'))]
+        compiler.postlink += [
+          compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a')),
+          compiler.Dep(os.path.join(lib_folder, 'mathlib_i486.a'))
+        ]
 
-    binary = self.LibraryBuilder(compiler, name, arch)
+      if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']:
+        compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
 
-    dynamic_libs = [] # todo: this whole section is slightly different, but I imagine it is "more correct"
-    if builder.target.platform == 'linux':
-      compiler.linkflags[0:0] = ['-lm', '-ldl'] # todo: do we need -ldl?
+    dynamic_libs = []
+    if builder.target_platform == 'linux':
       if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']:
         dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
-      elif arch == 'x64' and sdk.name == 'csgo':
-        dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so']
-      elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo', 'dota']:
+      elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo']:
         dynamic_libs = ['libtier0.so', 'libvstdlib.so']
       else:
         dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
-    elif builder.target.platform == 'mac':
-      binary.compiler.linkflags.append('-liconv')
+    elif builder.target_platform == 'mac':
+      compiler.linkflags.append('-liconv')
       dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
-    elif builder.target.platform == 'windows':
-      # todo: verify this for MSVC support
-      libs = ['tier0', 'tier1', 'vstdlib']
-      if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'csgo', 'dota']:
+    elif builder.target_platform == 'windows':
+      libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
+      if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'csgo']:
         libs.append('interfaces')
-      if sdk.name == 'bms':
-        libs.append('mathlib')
       for lib in libs:
-        if arch == 'x86':
-          lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
-        elif arch == 'x64':
-          lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
-        binary.compiler.linkflags.append(binary.Dep(lib_path))
+        lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
+        compiler.linkflags.append(compiler.Dep(lib_path))
 
     for library in dynamic_libs:
       source_path = os.path.join(lib_folder, library)
@@ -406,27 +414,36 @@ class MMSConfig(object):
         return link
 
       linker = make_linker(source_path, output_path)
-      binary.compiler.linkflags[0:0] = [binary.Dep(library, linker)]
+      compiler.linkflags[0:0] = [compiler.Dep(library, linker)]
 
     return binary
 
-MMS = MMSConfig()
-MMS.detectProductVersion()
-MMS.detectSDKs()
-MMS.configure()
+  def HL2Library(self, context, name, sdk):
+    binary = context.compiler.Library(name)
+    self.ConfigureForExtension(context, binary.compiler)
+    return self.ConfigureForHL2(binary, sdk)
 
-BuildScripts = [
-  'AMBuilder'
-]
+  def HL2Project(self, context, name):
+    project = context.compiler.LibraryProject(name)
+    self.ConfigureForExtension(context, project.compiler)
+    return project
+
+  def HL2Config(self, project, name, sdk):
+    binary = project.Configure(name, '{0} - {1}'.format(self.tag, sdk.name))
+    return self.ConfigureForHL2(binary, sdk)
 
-if getattr(builder.options, 'enable_tests', False):
-    BuildScripts += [] # add tests here
+Extension = ExtensionConfig()
+Extension.detectSDKs()
+Extension.configure()
 
-import os
+# Add additional buildscripts here
+BuildScripts = [
+  'AMBuilder',
+]
 
 if builder.backend == 'amb2':
   BuildScripts += [
     'PackageScript',
   ]
 
-builder.Build(BuildScripts, { 'MMS': MMS })
+builder.RunBuildScripts(BuildScripts, { 'Extension': Extension })

AMBuilder

@@ -1,28 +1,31 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os, sys
 
-proj_name = 'tf2dynschema'
+projectName = 'tf2econdynamic'
 
-proj_srcs = [
+sourceFiles = [
   'mmsplugin.cpp',
-  'smsdk_config.cpp',
   'econmanager.cpp',
 ]
 
-proj_c_flags = [
-]
-
-for sdk_name in MMS.sdks:
-  for arch in MMS.archs:
-    sdk = MMS.sdks[sdk_name]
+###############
+# Make sure to edit PackageScript, which copies your files to their appropriate locations
+# Simple extensions do not need to modify past this point.
 
-    if not arch in sdk.platformSpec[builder.target.platform]:
-      continue
+project = Extension.HL2Project(builder, projectName + '.ext')
 
-    name = proj_name + '_mm'
-    binary = MMS.HL2Library(builder, name, sdk, arch)
+if os.path.isfile(os.path.join(builder.currentSourcePath, 'sdk', 'smsdk_ext.cpp')):
+  # Use the copy included in the project
+  project.sources += [os.path.join('sdk', 'smsdk_ext.cpp')]
+else:
+  # Use the copy included with SM 1.6 and newer
+  project.sources += [os.path.join(Extension.sm_root, 'public', 'smsdk_ext.cpp')]
 
-    binary.sources += proj_srcs
+project.sources += sourceFiles
+  
+for sdk_name in Extension.sdks:
+  sdk = Extension.sdks[sdk_name]
+  
+  binary = Extension.HL2Config(project, projectName + '.ext.' + sdk.ext, sdk)
 
-    nodes = builder.Add(binary)
-    MMS.binaries += [nodes]
+Extension.extensions = builder.Add(project)

PackageScript

@@ -1,17 +1,13 @@
 # vim: set ts=8 sts=2 sw=2 tw=99 et ft=python:
 import os
 
-mms_plugin_directory = 'addons/dynattrs'
-
 # This is where the files will be output to
 # package is the default
 builder.SetBuildFolder('package')
 
 # Add any folders you need to this list
 folder_list = [
-  mms_plugin_directory + '/bin',
-  
-  'addons/metamod', ## !CHANGEME! if you want to add the VDF loader
+  'addons/sourcemod/extensions',
   'addons/sourcemod/gamedata',
 ]
 
@@ -30,14 +26,14 @@ def CopyFiles(src, dest, files):
     source_path = os.path.join(builder.sourcePath, src, source_file)
     builder.AddCopy(source_path, dest_entry)
 
-CopyFiles('', 'addons/metamod', [
-  'tf2dynschema.vdf', ## !CHANGEME! if you want to add the VDF loader
-])
-
 CopyFiles('gamedata', 'addons/sourcemod/gamedata', [
   'tf2.econ_dynamic.txt',
 ])
 
+CopyFiles('', 'addons/sourcemod/extensions', [
+  'tf2econdynamic.autoload',
+])
+
 # Copy binaries.
-for cxx_task in MMS.binaries:
-  builder.AddCopy(cxx_task.binary, folder_map[mms_plugin_directory + '/bin'])
+for cxx_task in Extension.extensions:
+  builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])

configure.py

@@ -1,35 +1,23 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et:
 import sys
-try:
-  from ambuild2 import run, util
-except:
-  try:
-    import ambuild
-    sys.stderr.write('It looks like you have AMBuild 1 installed, but this project uses AMBuild 2.\n')
-    sys.stderr.write('Upgrade to the latest version of AMBuild to continue.\n')
-  except:
-    sys.stderr.write('AMBuild must be installed to build this project.\n')
-    sys.stderr.write('http://www.alliedmods.net/ambuild\n')
-  sys.exit(1)
+from ambuild2 import run
 
-def make_objdir_name(p):
-    return 'obj-' + util.Platform() + '-' + p.target_arch
+# Simple extensions do not need to modify this file.
 
-parser = run.BuildParser(sourcePath=sys.path[0], api='2.1')
-parser.default_arch = 'x86'
-parser.default_build_folder = make_objdir_name
-parser.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
-                       help='Root search folder for HL2SDKs')
-parser.options.add_option('--mms_path', type=str, dest='mms_path', default=None,
-                       help='Metamod:Source source tree folder')
-parser.options.add_option('--sm-path', type=str, dest='sm_path', default=None,
-                       help='SourceMod source tree folder')
-parser.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
+builder = run.PrepareBuild(sourcePath = sys.path[0])
+
+builder.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
+		                   help='Root search folder for HL2SDKs')
+builder.options.add_option('--mms-path', type=str, dest='mms_path', default=None,
+                       help='Path to Metamod:Source')
+builder.options.add_option('--sm-path', type=str, dest='sm_path', default=None,
+                       help='Path to SourceMod')
+builder.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
                        help='Enable debugging symbols')
-parser.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
+builder.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
                        help='Enable optimization')
-parser.options.add_option('-s', '--sdks', default='all', dest='sdks',
+builder.options.add_option('-s', '--sdks', default='all', dest='sdks',
                        help='Build against specified SDKs; valid args are "all", "present", or '
                             'comma-delimited list of engine names (default: %default)')
-parser.options.add_option('--enable-tests', default=False, dest='enable_tests', action='store_true',
-                       help='Build tests.')
-parser.Configure()
+
+builder.Configure()

econmanager.cpp

@@ -28,7 +28,7 @@ bool CEconManager::Init(char *error, size_t maxlength) {
 	// get the base address of the server
 	
 	SourceMod::IGameConfig *conf;
-	if (!sm_gameconfs->LoadGameConfigFile("tf2.econ_dynamic", &conf, error, maxlength)) {
+	if (!gameconfs->LoadGameConfigFile("tf2.econ_dynamic", &conf, error, maxlength)) {
 		return false;
 	}
 	
@@ -40,7 +40,7 @@ bool CEconManager::Init(char *error, size_t maxlength) {
 		return false;
 	}
 	
-	sm_gameconfs->CloseGameConfigFile(conf);
+	gameconfs->CloseGameConfigFile(conf);
 	
 	// is this late enough in the MM:S load stage?  we might just have to hold the function
 	g_SchemaAttributes = reinterpret_cast<AttributeMap*>(fnGetEconItemSchema() + 0x1BC);

mmsplugin.cpp

@@ -14,55 +14,35 @@
 
 #include <map>
 
-void BindToSourceMod();
-bool SM_LoadExtension(char *error, size_t maxlength);
-void SM_UnloadExtension();
-
-SH_DECL_HOOK3_void(IServerGameDLL, ServerActivate, SH_NOATTRIB, 0, edict_t *, int, int);
 SH_DECL_HOOK6(IServerGameDLL, LevelInit, SH_NOATTRIB, 0, bool, char const *, char const *, char const *, char const *, bool, bool);
 
 DynSchema g_Plugin;
-IServerGameDLL *server = nullptr;
-IVEngineServer *engine = NULL;
 IFileSystem *filesystem = nullptr;
 
-PLUGIN_EXPOSE(DynSchema, g_Plugin);
+SMEXT_LINK(&g_Plugin);
 
 const char* NATIVE_ATTRIB_DIR = "addons/sourcemod/configs/tf2nativeattribs";
 
-bool DynSchema::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen, bool late)
-{
-	PLUGIN_SAVEVARS();
-
-	GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
-	GET_V_IFACE_ANY(GetServerFactory, server, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
+bool DynSchema::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late) {
 	GET_V_IFACE_CURRENT(GetFileSystemFactory, filesystem, IFileSystem, FILESYSTEM_INTERFACE_VERSION);
-
-	SH_ADD_HOOK_MEMFUNC(IServerGameDLL, LevelInit, server, this, &DynSchema::Hook_LevelInitPost, true);
+	
 	return true;
 }
 
-bool DynSchema::OnExtensionLoad(IExtension *me, IShareSys *sys, char *error, size_t maxlength, bool late) {
-	sharesys = sys;
-	myself = me;
-
-	/* Get the default interfaces from our configured SDK header */
-	if (!SM_AcquireInterfaces(error, maxlength)) {
-		return false;
-	}
+bool DynSchema::SDK_OnLoad(char *error, size_t maxlen, bool late)
+{
+	SH_ADD_HOOK_MEMFUNC(IServerGameDLL, LevelInit, gamedll, this, &DynSchema::Hook_LevelInitPost, true);
 
 	/* Prepare our manager */
-	if (!g_EconManager.Init(error, maxlength)) {
+	if (!g_EconManager.Init(error, maxlen)) {
 		return false;
 	}
-	
+
 	return true;
 }
 
-bool DynSchema::Unload(char *error, size_t maxlen) {
-	SM_UnloadExtension();
-	SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, LevelInit, server, this, &DynSchema::Hook_LevelInitPost, true);
-	return true;
+void DynSchema::SDK_OnUnload() {
+	SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, LevelInit, gamedll, this, &DynSchema::Hook_LevelInitPost, true);
 }
 
 bool DynSchema::Hook_LevelInitPost(const char *pMapName, char const *pMapEntities,
@@ -122,148 +102,3 @@ bool DynSchema::Hook_LevelInitPost(const char *pMapName, char const *pMapEntitie
 	
 	return true;
 }
-
-void DynSchema::AllPluginsLoaded() {
-	/* This is where we'd do stuff that relies on the mod or other plugins 
-	 * being initialized (for example, cvars added and events registered).
-	 */
-	BindToSourceMod();
-}
-
-void* DynSchema::OnMetamodQuery(const char* iface, int *ret) {
-	if (strcmp(iface, SOURCEMOD_NOTICE_EXTENSIONS) == 0) {
-		BindToSourceMod();
-	}
-	if (ret != NULL) {
-		*ret = IFACE_OK;
-	}
-	return NULL;
-}
-
-void BindToSourceMod() {
-	char error[256];
-	if (!SM_LoadExtension(error, sizeof(error))) {
-		char message[512];
-		snprintf(message, sizeof(message), "Could not load as a SourceMod extension: %s\n", error);
-		engine->LogPrint(message);
-	}
-}
-
-bool SM_LoadExtension(char *error, size_t maxlength) {
-	if ((smexts = (IExtensionManager *)
-			g_SMAPI->MetaFactory(SOURCEMOD_INTERFACE_EXTENSIONS, NULL, NULL)) == NULL) {
-		if (error && maxlength) {
-			snprintf(error, maxlength, SOURCEMOD_INTERFACE_EXTENSIONS " interface not found");
-		}
-		return false;
-	}
-
-	/* This could be more dynamic */
-	char path[256];
-	g_SMAPI->PathFormat(path, sizeof(path),  "addons/dynattrs/tf2dynschema%s",
-#if defined __linux__
-		"_mm.so"
-#else
-		".dll"
-#endif	
-	);
-
-	if ((myself = smexts->LoadExternal(&g_Plugin, path, "dynschema.ext", error, maxlength))
-			== NULL) {
-		SM_UnsetInterfaces();
-		return false;
-	}
-	return true;
-}
-
-void SM_UnloadExtension() {
-	smexts->UnloadExtension(myself);
-}
-
-bool DynSchema::Pause(char *error, size_t maxlen) {
-	return true;
-}
-
-bool DynSchema::Unpause(char *error, size_t maxlen) {
-	return true;
-}
-
-const char *DynSchema::GetLicense() {
-	return "GPLv3+";
-}
-
-const char *DynSchema::GetVersion() {
-	return "1.3.0";
-}
-
-const char *DynSchema::GetDate() {
-	return __DATE__;
-}
-
-const char *DynSchema::GetLogTag() {
-	return "dynschema";
-}
-
-const char *DynSchema::GetAuthor() {
-	return "nosoop";
-}
-
-const char *DynSchema::GetDescription() {
-	return "Injects user-defined content into the game schema";
-}
-
-const char *DynSchema::GetName() {
-	return "TF2 Dynamic Schema";
-}
-
-const char *DynSchema::GetURL() {
-	return "https://git.csrd.science/";
-}
-
-void DynSchema::OnExtensionUnload() {
-	SM_UnsetInterfaces();
-}
-
-void DynSchema::OnExtensionsAllLoaded() {
-	// no-op
-}
-
-void DynSchema::OnExtensionPauseChange(bool pause) {
-	// no-op
-}
-
-bool DynSchema::QueryRunning(char *error, size_t maxlength) {
-	return true;
-}
-
-bool DynSchema::IsMetamodExtension() {
-	return true;
-}
-
-const char *DynSchema::GetExtensionName() {
-	return this->GetName();
-}
-
-const char *DynSchema::GetExtensionURL() {
-	return this->GetURL();
-}
-
-const char *DynSchema::GetExtensionTag() {
-	return this->GetLogTag();
-}
-
-const char *DynSchema::GetExtensionAuthor() {
-	return this->GetAuthor();
-}
-
-const char *DynSchema::GetExtensionVerString() {
-	return this->GetVersion();
-}
-
-const char *DynSchema::GetExtensionDescription() {
-	return this->GetDescription();
-}
-
-const char *DynSchema::GetExtensionDateString() {
-	return this->GetDate();
-}

mmsplugin.h

@@ -1,79 +1,113 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
- * ======================================================
- * Metamod:Source Stub Plugin
- * Written by AlliedModders LLC.
- * ======================================================
+ * vim: set ts=4 :
+ * =============================================================================
+ * TF2 Econ Dynamic Extension
+ * Copyright (C) 2023 nosoop.  All rights reserved.
+ * =============================================================================
  *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from 
- * the use of this software.
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * This stub plugin is public domain.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
  */
 
-#ifndef _INCLUDE_METAMOD_SOURCE_STUB_PLUGIN_H_
-#define _INCLUDE_METAMOD_SOURCE_STUB_PLUGIN_H_
+#ifndef _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_
+#define _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_
 
-#include <ISmmPlugin.h>
-#include <smsdk_config.h>
-
-#if defined WIN32 && !defined snprintf
-#define snprintf _snprintf
-#endif
+#include <smsdk_ext.h>
 
-using SourceMod::IExtension;
-using SourceMod::IShareSys;
-using SourceMod::IExtensionManager;
-
-class DynSchema : public ISmmPlugin, public SourceMod::IExtensionInterface, public IMetamodListener
+class DynSchema : public SDKExtension
 {
 public:
-	bool Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen, bool late);
-	bool Unload(char *error, size_t maxlen);
-	bool Pause(char *error, size_t maxlen);
-	bool Unpause(char *error, size_t maxlen);
-	void AllPluginsLoaded();
-	
-	bool Hook_LevelInitPost(const char *pMapName, char const *pMapEntities, char const *pOldLevel,
-			char const *pLandmarkName, bool loadGame, bool background);
-	
-	void *OnMetamodQuery(const char* iface, int *ret);
-public:
-	const char *GetAuthor();
-	const char *GetName();
-	const char *GetDescription();
-	const char *GetURL();
-	const char *GetLicense();
-	const char *GetVersion();
-	const char *GetDate();
-	const char *GetLogTag();
+	/**
+	 * @brief This is called after the initial loading sequence has been processed.
+	 *
+	 * @param error		Error message buffer.
+	 * @param maxlength	Size of error message buffer.
+	 * @param late		Whether or not the module was loaded after map load.
+	 * @return			True to succeed loading, false to fail.
+	 */
+	virtual bool SDK_OnLoad(char *error, size_t maxlength, bool late);
 	
-public:
-	virtual bool OnExtensionLoad(IExtension *me, IShareSys *sys, char* error, size_t maxlength, bool late);
-	virtual void OnExtensionUnload();
-	virtual void OnExtensionsAllLoaded();
-	virtual void OnExtensionPauseChange(bool pause);
-	virtual bool QueryRunning(char *error, size_t maxlength);
-	virtual bool IsMetamodExtension();
-	virtual const char *GetExtensionName();
-	virtual const char *GetExtensionURL();
-	virtual const char *GetExtensionTag();
-	virtual const char *GetExtensionAuthor();
-	virtual const char *GetExtensionVerString();
-	virtual const char *GetExtensionDescription();
-	virtual const char *GetExtensionDateString();
-};
+	/**
+	 * @brief This is called right before the extension is unloaded.
+	 */
+	virtual void SDK_OnUnload();
 
-extern DynSchema g_Plugin;
+	/**
+	 * @brief This is called once all known extensions have been loaded.
+	 * Note: It is is a good idea to add natives here, if any are provided.
+	 */
+	//virtual void SDK_OnAllLoaded();
 
-extern SourceMod::IExtensionManager *smexts;
+	/**
+	 * @brief Called when the pause state is changed.
+	 */
+	//virtual void SDK_OnPauseChange(bool paused);
 
-extern SourceMod::IShareSys *sharesys;
-extern SourceMod::IExtension *myself;
+	/**
+	 * @brief this is called when Core wants to know if your extension is working.
+	 *
+	 * @param error		Error message buffer.
+	 * @param maxlength	Size of error message buffer.
+	 * @return			True if working, false otherwise.
+	 */
+	//virtual bool QueryRunning(char *error, size_t maxlength);
+public:
+#if defined SMEXT_CONF_METAMOD
+	/**
+	 * @brief Called when Metamod is attached, before the extension version is called.
+	 *
+	 * @param error			Error buffer.
+	 * @param maxlength		Maximum size of error buffer.
+	 * @param late			Whether or not Metamod considers this a late load.
+	 * @return				True to succeed, false to fail.
+	 */
+	virtual bool SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlength, bool late);
 
-extern IServerGameDLL *server;
+	/**
+	 * @brief Called when Metamod is detaching, after the extension version is called.
+	 * NOTE: By default this is blocked unless sent from SourceMod.
+	 *
+	 * @param error			Error buffer.
+	 * @param maxlength		Maximum size of error buffer.
+	 * @return				True to succeed, false to fail.
+	 */
+	//virtual bool SDK_OnMetamodUnload(char *error, size_t maxlength);
 
-PLUGIN_GLOBALVARS();
+	/**
+	 * @brief Called when Metamod's pause state is changing.
+	 * NOTE: By default this is blocked unless sent from SourceMod.
+	 *
+	 * @param paused		Pause state being set.
+	 * @param error			Error buffer.
+	 * @param maxlength		Maximum size of error buffer.
+	 * @return				True to succeed, false to fail.
+	 */
+	//virtual bool SDK_OnMetamodPauseChange(bool paused, char *error, size_t maxlength);
+#endif
+
+private:
+	bool Hook_LevelInitPost(const char *pMapName, char const *pMapEntities,
+		char const *pOldLevel, char const *pLandmarkName, bool loadGame, bool background);
+};
 
-#endif //_INCLUDE_METAMOD_SOURCE_STUB_PLUGIN_H_
+#endif //_INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_

smsdk_config.cpp

@@ -1,190 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Extension Code for Metamod:Source
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#include "smsdk_config.h"
-
-using namespace SourceMod;
-
-bool SM_AcquireInterfaces(char *error, size_t maxlength)
-{
-	SM_FIND_IFACE_OR_FAIL(SOURCEMOD, sm_main, error, maxlength);
-
-#if defined SMEXT_ENABLE_FORWARDSYS
-	SM_FIND_IFACE_OR_FAIL(FORWARDMANAGER, sm_forwards, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_HANDLESYS
-	SM_FIND_IFACE_OR_FAIL(HANDLESYSTEM, sm_handlesys, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_PLAYERHELPERS
-	SM_FIND_IFACE_OR_FAIL(PLAYERMANAGER, sm_players, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_DBMANAGER
-	SM_FIND_IFACE_OR_FAIL(DBI, sm_dbi, error, maxlength);
-#endif 
-#if defined SMEXT_ENABLE_GAMECONF
-	SM_FIND_IFACE_OR_FAIL(GAMECONFIG, sm_gameconfs, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_MEMUTILS
-	SM_FIND_IFACE_OR_FAIL(MEMORYUTILS, sm_memutils, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_GAMEHELPERS
-	SM_FIND_IFACE_OR_FAIL(GAMEHELPERS, sm_gamehelpers, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_TIMERSYS
-	SM_FIND_IFACE_OR_FAIL(TIMERSYS, sm_timersys, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_THREADER
-	SM_FIND_IFACE_OR_FAIL(THREADER, sm_threader, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_LIBSYS
-	SM_FIND_IFACE_OR_FAIL(LIBRARYSYS, sm_libsys, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_PLUGINSYS
-	SM_FIND_IFACE_OR_FAIL(PLUGINSYSTEM, sm_plsys, error, maxlength);
-#endif 
-#if defined SMEXT_ENABLE_MENUS
-	SM_FIND_IFACE_OR_FAIL(MENUMANAGER, sm_menus, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_ADMINSYS
-	SM_FIND_IFACE_OR_FAIL(ADMINSYS, sm_adminsys, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_TEXTPARSERS
-	SM_FIND_IFACE_OR_FAIL(TEXTPARSERS, sm_text, error, maxlength);
-#endif
-#if defined SMEXT_ENABLE_TRANSLATOR
-	SM_FIND_IFACE_OR_FAIL(TRANSLATOR, sm_translator, error, maxlength);
-#endif
-
-	return true;
-}
-
-void SM_UnsetInterfaces()
-{
-	myself = NULL;
-	smexts = NULL;
-	sharesys = NULL;
-	sm_main = NULL;
-#if defined SMEXT_ENABLE_FORWARDSYS
-	sm_forwards = NULL;
-#endif
-#if defined SMEXT_ENABLE_HANDLESYS
-	sm_handlesys = NULL;
-#endif
-#if defined SMEXT_ENABLE_PLAYERHELPERS
-	sm_players = NULL;
-#endif
-#if defined SMEXT_ENABLE_DBMANAGER
-	sm_dbi = NULL;
-#endif 
-#if defined SMEXT_ENABLE_GAMECONF
-	sm_gameconfs = NULL;
-#endif
-#if defined SMEXT_ENABLE_MEMUTILS
-	sm_memutils = NULL;
-#endif
-#if defined SMEXT_ENABLE_GAMEHELPERS
-	sm_gamehelpers = NULL;
-#endif
-#if defined SMEXT_ENABLE_TIMERSYS
-	sm_timersys = NULL;
-#endif
-#if defined SMEXT_ENABLE_THREADER
-	sm_threader = NULL;
-#endif
-#if defined SMEXT_ENABLE_LIBSYS
-	sm_libsys = NULL;
-#endif
-#if defined SMEXT_ENABLE_PLUGINSYS
-	sm_plsys = NULL;
-#endif 
-#if defined SMEXT_ENABLE_MENUS
-	sm_menus = NULL;
-#endif
-#if defined SMEXT_ENABLE_ADMINSYS
-	sm_adminsys = NULL;
-#endif
-#if defined SMEXT_ENABLE_TEXTPARSERS
-	sm_text = NULL;
-#endif
-#if defined SMEXT_ENABLE_TRANSLATOR
-	sm_translator = NULL;
-#endif
-}
-
-IExtension *myself = NULL;
-IExtensionManager *smexts = NULL;
-IShareSys *sharesys = NULL;
-SourceMod::ISourceMod *sm_main = NULL;
-#if defined SMEXT_ENABLE_FORWARDSYS
-SourceMod::IForwardManager *sm_forwards = NULL;
-#endif
-#if defined SMEXT_ENABLE_HANDLESYS
-SourceMod::IHandleSys *sm_handlesys = NULL;
-#endif
-#if defined SMEXT_ENABLE_PLAYERHELPERS
-SourceMod::IPlayerManager *sm_players = NULL;
-#endif
-#if defined SMEXT_ENABLE_DBMANAGER
-SourceMod::IDBManager *sm_dbi = NULL;
-#endif 
-#if defined SMEXT_ENABLE_GAMECONF
-SourceMod::IGameConfigManager *sm_gameconfs = NULL;
-#endif
-#if defined SMEXT_ENABLE_MEMUTILS
-SourceMod::IMemoryUtils *sm_memutils = NULL;
-#endif
-#if defined SMEXT_ENABLE_GAMEHELPERS
-SourceMod::IGameHelpers *sm_gamehelpers = NULL;
-#endif
-#if defined SMEXT_ENABLE_TIMERSYS
-SourceMod::ITimerSystem *sm_timersys = NULL;
-#endif
-#if defined SMEXT_ENABLE_THREADER
-SourceMod::IThreader *sm_threader = NULL;
-#endif
-#if defined SMEXT_ENABLE_LIBSYS
-SourceMod::ILibrarySys *sm_libsys = NULL;
-#endif
-#if defined SMEXT_ENABLE_PLUGINSYS
-SourceMod::IPluginManager *sm_plsys = NULL;
-#endif 
-#if defined SMEXT_ENABLE_MENUS
-SourceMod::IMenuManager *sm_menus = NULL;
-#endif
-#if defined SMEXT_ENABLE_ADMINSYS
-SourceMod::IAdminSystem *sm_adminsys = NULL;
-#endif
-#if defined SMEXT_ENABLE_TEXTPARSERS
-SourceMod::ITextParsers *sm_text = NULL;
-#endif
-#if defined SMEXT_ENABLE_TRANSLATOR
-SourceMod::ITranslator *sm_translator = NULL;
-#endif

smsdk_config.h

@@ -1,8 +1,8 @@
 /**
  * vim: set ts=4 :
  * =============================================================================
- * SourceMod Extension Code for Metamod:Source
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * TF2 Econ Dynamic Extension
+ * Copyright (C) 2023 nosoop.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -29,32 +29,36 @@
  * Version: $Id$
  */
 
-#ifndef _INCLUDE_SOURCEMOD_CONFIG_H_
-#define _INCLUDE_SOURCEMOD_CONFIG_H_
-
-#include <stdio.h>
+#ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
+#define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
 
 /**
- * @brief Acquires the interfaces enabled at the bottom of this header.
- *
- * @param error			Buffer to store error message.
- * @param maxlength		Maximum size of the error buffer.
- * @return				True on success, false on failure.
- * 						On failure, a null-terminated string will be stored 
- * 						in the error buffer, if the buffer is non-NULL and 
- * 						greater than 0 bytes in size.
+ * @file smsdk_config.h
+ * @brief Contains macros for configuring basic extension information.
  */
-bool SM_AcquireInterfaces(char *error, size_t maxlength);
 
-/**
- * @brief Sets each acquired interface to NULL.
- */
-void SM_UnsetInterfaces();
+/* Basic information exposed publicly */
+#define SMEXT_CONF_NAME			"TF2 Econ Dynamic"
+#define SMEXT_CONF_DESCRIPTION	"Injects user-defined content into the game schema"
+#define SMEXT_CONF_VERSION		"1.3.0"
+#define SMEXT_CONF_AUTHOR		"nosoop"
+#define SMEXT_CONF_URL			"https://github.com/nosoop/SMExt-TFEconDynamic"
+#define SMEXT_CONF_LOGTAG		"dynschema"
+#define SMEXT_CONF_LICENSE		"GPLv3+"
+#define SMEXT_CONF_DATESTRING	__DATE__
 
 /** 
- * Enable interfaces you want to use here by uncommenting lines.
- * These interfaces are all part of SourceMod's core.
+ * @brief Exposes plugin's main interface.
  */
+#define SMEXT_LINK(name) SDKExtension *g_pExtensionIface = name;
+
+/**
+ * @brief Sets whether or not this plugin required Metamod.
+ * NOTE: Uncomment to enable, comment to disable.
+ */
+#define SMEXT_CONF_METAMOD
+
+/** Enable interfaces you want to use here by uncommenting lines */
 //#define SMEXT_ENABLE_FORWARDSYS
 //#define SMEXT_ENABLE_HANDLESYS
 //#define SMEXT_ENABLE_PLAYERHELPERS
@@ -70,96 +74,8 @@ void SM_UnsetInterfaces();
 //#define SMEXT_ENABLE_PLUGINSYS
 //#define SMEXT_ENABLE_ADMINSYS
 //#define SMEXT_ENABLE_TEXTPARSERS
+//#define SMEXT_ENABLE_USERMSGS
 //#define SMEXT_ENABLE_TRANSLATOR
+//#define SMEXT_ENABLE_ROOTCONSOLEMENU
 
-
-/**
- * There is no need to edit below.
- */
-
-#include <IShareSys.h>
-#include <IExtensionSys.h>
-extern SourceMod::IExtension *myself;
-extern SourceMod::IExtensionManager *smexts;
-extern SourceMod::IShareSys *sharesys;
-
-#include <ISourceMod.h>
-extern SourceMod::ISourceMod *sm_main;
-
-#if defined SMEXT_ENABLE_FORWARDSYS
-#include <IForwardSys.h>
-extern SourceMod::IForwardManager *sm_forwards;
-#endif
-
-#if defined SMEXT_ENABLE_HANDLESYS
-#include <IHandleSys.h>
-extern SourceMod::IHandleSys *sm_handlesys;
-#endif
-
-#if defined SMEXT_ENABLE_PLAYERHELPERS
-#include <IPlayerHelpers.h>
-extern SourceMod::IPlayerManager *sm_players;
-#endif
-
-#if defined SMEXT_ENABLE_DBMANAGER
-#include <IDBDriver.h>
-extern SourceMod::IDBManager *sm_dbi;
-#endif 
-
-#if defined SMEXT_ENABLE_GAMECONF
-#include <IGameConfigs.h>
-extern SourceMod::IGameConfigManager *sm_gameconfs;
-#endif
-
-#if defined SMEXT_ENABLE_MEMUTILS
-#include <IMemoryUtils.h>
-extern SourceMod::IMemoryUtils *sm_memutils;
-#endif
-
-#if defined SMEXT_ENABLE_GAMEHELPERS
-#include <IGameHelpers.h>
-extern SourceMod::IGameHelpers *sm_gamehelpers;
-#endif
-
-#if defined SMEXT_ENABLE_TIMERSYS
-#include <ITimerSystem.h>
-extern SourceMod::ITimerSystem *sm_timersys;
-#endif
-
-#if defined SMEXT_ENABLE_THREADER
-#include <IThreader.h>
-extern SourceMod::IThreader *sm_threader;
-#endif
-
-#if defined SMEXT_ENABLE_LIBSYS
-#include <ILibrarySys.h>
-extern SourceMod::ILibrarySys *sm_libsys;
-#endif
-
-#if defined SMEXT_ENABLE_PLUGINSYS
-#include <IPluginSys.h>
-extern SourceMod::IPluginManager *sm_plsys;
-#endif 
-
-#if defined SMEXT_ENABLE_MENUS
-#include <IMenuManager.h>
-extern SourceMod::IMenuManager *sm_menus;
-#endif
-
-#if defined SMEXT_ENABLE_ADMINSYS
-#include <IAdminSystem.h>
-extern SourceMod::IAdminSystem *sm_adminsys;
-#endif
-
-#if defined SMEXT_ENABLE_TEXTPARSERS
-#include <ITextParsers.h>
-extern SourceMod::ITextParsers *sm_text;
-#endif
-
-#if defined SMEXT_ENABLE_TRANSLATOR
-#include <ITranslator.h>
-extern SourceMod::ITranslator *sm_translator;
-#endif
-
-#endif //_INCLUDE_SOURCEMOD_CONFIG_H_
-
+#endif // _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_

tf2dynschema.vdf

@@ -1,5 +0,0 @@
-"Metamod Plugin"
-{
-	"alias"		"dynschema"
-	"file"		"addons/dynattrs/bin/tf2dynschema_mm"
-}

tf2econdynamic.autoload

@@ -0,0 +1 @@
+ECHO is on.