Switch to AMBuild & WIP port to Counter-Strike 2

.gitattributes

@@ -1 +0,0 @@
-Makefile linguist-generated=true

AMBuildScript

@@ -0,0 +1,526 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os, sys
+
+additional_libs = [
+  # Path should be relative either to hl2sdk folder or to build folder
+  #'path/to/lib/example.lib',
+]
+
+additional_defines = [
+  #'EXAMPLE_DEFINE=2'
+]
+
+additional_includes = [
+  # Path should be absolute only!
+  #'D:/absolute/path/to/include/folder/'
+]
+
+class SDK(object):
+  def __init__(self, sdk, ext, aDef, name, platform, dir):
+    self.folder = 'hl2sdk-' + dir
+    self.envvar = sdk
+    self.ext = ext
+    self.code = aDef
+    self.define = name
+    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, targets):
+    for cxx in targets:
+      if cxx.target.platform in self.platformSpec:
+        if cxx.target.arch in self.platformSpec[cxx.target.platform]:
+          return True
+    return False
+
+WinOnly = ['windows']
+WinLinux = ['windows', 'linux']
+WinLinuxMac = ['windows', 'linux', 'mac']
+CSGO = {
+  'windows': ['x86'],
+  'linux': ['x86', 'x86_64'],
+  'mac': ['x86_64']
+}
+Source2 = {
+  'windows': ['x86_64'],
+  'linux': ['x86_64'],
+}
+Insurgency = {
+  'windows': ['x86', 'x86_64'],
+  'linux': ['x86'],
+  'mac': ['x86', 'x86_64'],
+}
+Blade = {
+  'windows': ['x86', 'x86_64'],
+  'linux': ['x86_64']
+}
+Mock = {
+  'windows': ['x86', 'x86_64'],
+  'linux': ['x86', 'x86_64'],
+  'mac': ['x86_64']
+}
+
+PossibleSDKs = {
+  'episode1':  SDK('HL2SDK', '2.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', '12', 'TF2', WinLinuxMac, 'tf2'),
+  'l4d':  SDK('HL2SDKL4D', '2.l4d', '13', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
+  'nucleardawn': SDK('HL2SDKND', '2.nd', '14', 'NUCLEARDAWN', WinLinuxMac, 'nucleardawn'),
+  'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '16', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
+  'darkm':  SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
+  'swarm':  SDK('HL2SDK-SWARM', '2.swarm', '17', 'ALIENSWARM', WinOnly, 'swarm'),
+  'bgt':  SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
+  'eye':  SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
+  'mcv': SDK('HL2SDKMCV', '2.mcv', '22', 'MCV', WinOnly, 'mcv'),
+  'csgo': SDK('HL2SDKCSGO', '2.csgo', '23', 'CSGO', CSGO, 'csgo'),
+  'portal2':  SDK('HL2SDKPORTAL2', '2.portal2', '18', 'PORTAL2', [], 'portal2'),
+  'blade':  SDK('HL2SDKBLADE', '2.blade', '19', 'BLADE', Blade, 'blade'),
+  'insurgency':  SDK('HL2SDKINSURGENCY', '2.insurgency', '20', 'INSURGENCY', Insurgency, 'insurgency'),
+  'doi':  SDK('HL2SDKDOI', '2.doi', '21', 'DOI', WinLinuxMac, 'doi'),
+  'contagion':  SDK('HL2SDKCONTAGION', '2.contagion', '15', 'CONTAGION', WinOnly, 'contagion'),
+  'bms':  SDK('HL2SDKBMS', '2.bms', '11', 'BMS', WinLinux, 'bms'),
+  'mock': SDK('HL2SDK-MOCK', '2.mock', '999', 'MOCK', Mock, 'mock'),
+  'pvkii': SDK('HL2SDKPVKII', '2.pvkii', '10', 'PVKII', WinLinux, 'pvkii'),
+  'dota': SDK('HL2SDKDOTA', '2.dota', '24', 'DOTA', Source2, 'dota'),
+  'cs2': SDK('HL2SDKCS2', '2.cs2', '25', 'CS2', Source2, 'cs2'),
+}
+
+def ResolveEnvPath(env, folder):
+  if env in os.environ:
+    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
+
+def Normalize(path):	
+  return os.path.abspath(os.path.normpath(path))
+
+class MMSPluginConfig(object):
+  def __init__(self):
+    self.sdks = {}
+    self.binaries = []
+    self.mms_root = None
+    self.all_targets = []
+    self.target_archs = set()
+
+    if builder.options.plugin_name is not None:
+      self.plugin_name = builder.options.plugin_name
+    else:
+      self.plugin_name = 'MovementUnlocker'
+
+    if builder.options.plugin_alias is not None:
+      self.plugin_alias = builder.options.plugin_alias
+    else:
+      self.plugin_alias = 'MovementUnlocker'
+
+    if builder.options.targets:
+      target_archs = builder.options.targets.split(',')
+    else:
+      target_archs = ['x86']
+      target_archs.append('x86_64')
+
+    for arch in target_archs:
+        try:
+            cxx = builder.DetectCxx(target_arch = arch)
+            self.target_archs.add(cxx.target.arch)
+        except Exception as e:
+            # Error if archs were manually overridden.
+            if builder.options.targets:
+                raise
+            print('Skipping target {}: {}'.format(arch, e))
+            continue
+        self.all_targets.append(cxx)
+
+    if not self.all_targets:
+        raise Exception('No suitable C/C++ compiler was found.')
+
+  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 = []
+
+    not_found = []
+    for sdk_name in PossibleSDKs:
+      sdk = PossibleSDKs[sdk_name]
+      if sdk.shouldBuild(self.all_targets):
+        if builder.options.hl2sdk_root:
+          sdk_path = os.path.join(builder.options.hl2sdk_root, sdk.folder)
+          if not os.path.exists(sdk_path):
+            sdk_path = None
+        else:
+          sdk_path = ResolveEnvPath(sdk.envvar, sdk.folder)
+        if sdk_path is None:
+          if (use_all and sdk_name != 'mock') or sdk_name in sdk_list:
+            raise Exception('Could not find a valid path for {0}'.format(sdk.envvar))
+          not_found.append(sdk_name)
+          continue
+        if use_all or use_present or sdk_name in sdk_list:
+          sdk.path = sdk_path
+          self.sdks[sdk_name] = sdk
+
+    if len(self.sdks) < 1 and len(sdk_list):
+      raise Exception('No SDKs were found, nothing to build.')
+    
+    if len(self.sdks) > 1:
+      raise Exception('Only one sdk at a time is supported, for multi-sdk approach use loader based solution.')
+	
+    if builder.options.mms_path:	
+      self.mms_root = builder.options.mms_path	
+    else:	
+      self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
+      if not self.mms_root:	
+        self.mms_root = ResolveEnvPath('MMSOURCE111', 'mmsource-1.11')
+      if not self.mms_root:	
+        self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
+      if not self.mms_root:	
+        self.mms_root = ResolveEnvPath('MMSOURCE_DEV', '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)
+
+    if use_present:
+      for sdk in not_found:
+        print('Warning: hl2sdk-{} was not found, and will not be included in build.'.format(sdk))
+
+  def configure(self):
+    for cxx in self.all_targets:
+      if cxx.target.arch not in ['x86', 'x86_64']:
+        raise Exception('Unknown target architecture: {0}'.format(arch))
+
+      self.configure_cxx(cxx)
+
+  def configure_cxx(self, cxx):
+    if cxx.behavior == 'gcc':
+      cxx.defines += [
+        'stricmp=strcasecmp',
+        '_stricmp=strcasecmp',
+        '_snprintf=snprintf',
+        '_vsnprintf=vsnprintf',
+        'HAVE_STDINT_H',
+        'GNUC',
+      ]
+      cxx.cflags += [
+        '-pipe',
+        '-fno-strict-aliasing',
+        '-Wall',
+        '-Werror',
+        '-Wno-uninitialized',
+        '-Wno-unused',
+        '-Wno-switch',
+        '-msse',
+        '-fPIC',
+      ]
+
+      if cxx.version == 'apple-clang-6.0' or cxx.version == 'clang-3.4':
+        cxx.cxxflags += ['-std=c++1y']
+      else:
+        cxx.cxxflags += ['-std=c++14']
+      if (cxx.version >= 'gcc-4.0') or cxx.family == 'clang':
+        cxx.cflags += ['-fvisibility=hidden']
+        cxx.cxxflags += ['-fvisibility-inlines-hidden']
+      cxx.cxxflags += [
+        '-fno-exceptions',
+        '-fno-rtti',
+        '-fno-threadsafe-statics',
+        '-Wno-non-virtual-dtor',
+        '-Wno-overloaded-virtual',
+      ]
+      if (cxx.version >= 'gcc-4.7' or cxx.family == 'clang'):
+        cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
+      if cxx.family == 'gcc':
+        cxx.cflags += ['-mfpmath=sse']
+      if cxx.family == 'clang':
+        cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
+        if cxx.version >= 'clang-3.9' or cxx.version >= 'apple-clang-10.0':
+          cxx.cxxflags += ['-Wno-expansion-to-defined']
+        if cxx.version >= 'clang-3.6' or cxx.version >= 'apple-clang-7.0':
+          cxx.cxxflags += ['-Wno-inconsistent-missing-override']
+        if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
+          cxx.cxxflags += ['-Wno-deprecated-register']
+        else:
+          cxx.cxxflags += ['-Wno-deprecated']
+      
+      # Work around SDK warnings.
+      if cxx.version >= 'clang-10.0' or cxx.version >= 'apple-clang-12.0':
+        cxx.cflags += [
+          '-Wno-implicit-int-float-conversion',
+          '-Wno-tautological-overlap-compare',
+        ]
+
+    elif cxx.like('msvc'):
+      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',
+      ]
+      cxx.cflags += [
+        '/W3',
+        '/Zi',
+      ]
+      cxx.cxxflags += ['/TP']
+      
+      cxx.linkflags += [
+        '/SUBSYSTEM:WINDOWS',
+        'kernel32.lib',
+        'user32.lib',
+        'gdi32.lib',
+        'winspool.lib',
+        'comdlg32.lib',
+        'advapi32.lib',
+        'shell32.lib',
+        'ole32.lib',
+        'oleaut32.lib',
+        'uuid.lib',
+        'odbc32.lib',
+        'odbccp32.lib',
+      ]
+
+    # Optimization
+    if builder.options.opt == '1':
+      cxx.defines += ['NDEBUG']
+      if cxx.behavior == 'gcc':
+        cxx.cflags += ['-O3']
+      elif cxx.behavior == 'msvc':
+        cxx.cflags += ['/Ox', '/Zo']
+        cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
+
+    # Debugging
+    if builder.options.debug == '1':
+      cxx.defines += ['DEBUG', '_DEBUG']
+      if cxx.behavior == 'gcc':
+        cxx.cflags += ['-g3']
+      elif cxx.behavior == 'msvc':
+        cxx.cflags += ['/Od', '/RTC1']
+
+    # Don't omit the frame pointer.
+    # This needs to be after our optimization flags which could otherwise disable it.
+    if cxx.behavior == 'gcc':
+      cxx.cflags += ['-fno-omit-frame-pointer']
+    elif cxx.behavior == 'msvc':
+      cxx.cflags += ['/Oy-']
+
+    # Platform-specifics
+    if cxx.target.platform == 'linux':
+      cxx.defines += ['_LINUX', 'POSIX', '_FILE_OFFSET_BITS=64']
+      if cxx.family == 'gcc':
+        cxx.linkflags += ['-static-libgcc']
+      elif cxx.family == 'clang':
+        cxx.linkflags += ['-lgcc_eh']
+    elif cxx.target.platform == 'mac':
+      cxx.defines += ['OSX', '_OSX', 'POSIX']
+
+      if cxx.version >= 'apple-clang-10.0':
+        cxx.cflags += ['-mmacosx-version-min=10.9', '-stdlib=libc++']
+        cxx.linkflags += [
+          '-mmacosx-version-min=10.9',
+        ]
+      else:
+        cxx.cflags += ['-mmacosx-version-min=10.5']
+        cxx.linkflags += [
+          '-mmacosx-version-min=10.5',
+        ]
+
+      cxx.linkflags += [
+        '-lc++',
+      ]
+    elif cxx.target.platform == 'windows':
+      cxx.defines += ['WIN32', '_WINDOWS']
+
+    # Finish up.
+    # Custom defines here
+    cxx.defines += [ ]
+    # Custom includes here
+    cxx.includes += [ ]
+
+  def HL2Compiler(self, context, cxx, sdk):
+    compiler = cxx.clone()
+    mms_core_path = os.path.join(self.mms_root, 'core')
+    compiler.cxxincludes += [
+      os.path.join(mms_core_path),	
+      os.path.join(mms_core_path, 'sourcehook'),
+      os.path.join(context.currentSourcePath),
+    ]
+
+    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 sdk.name == 'episode1' or sdk.name == 'darkm':
+      paths.append(['public', 'dlls'])
+      paths.append(['game_shared'])
+    else:
+      paths.append(['public', 'game', 'server'])
+      paths.append(['game', 'shared'])
+      paths.append(['common'])
+    compiler.defines += ['SOURCE_ENGINE=' + sdk.code]
+
+    if sdk.name in ['sdk2013', 'bms', 'pvkii'] 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.family == 'msvc':
+      compiler.defines += ['COMPILER_MSVC']
+      if compiler.target.arch == 'x86':
+        compiler.defines += ['COMPILER_MSVC32']
+      elif compiler.target.arch == 'x86_64':
+        compiler.defines += ['COMPILER_MSVC64']
+      
+      if compiler.version >= 1900:
+        compiler.linkflags += ['legacy_stdio_definitions.lib']
+    else:
+      compiler.defines += ['COMPILER_GCC']
+      
+    if compiler.target.arch == 'x86_64':
+      compiler.defines += ['X64BITS', 'PLATFORM_64BITS']
+
+    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota', 'cs2', 'pvkii']:
+      if compiler.target.platform in ['linux', 'mac']:
+        compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
+
+    if sdk.name in ['csgo', 'blade', 'pvkii'] and compiler.target.platform == 'linux':
+      compiler.linkflags += ['-lstdc++']
+
+    if sdk.name in ['dota', 'cs2']:
+      compiler.defines += ['META_IS_SOURCE2']
+
+    for path in paths:
+      compiler.cxxincludes += [os.path.join(sdk.path, *path)]
+
+    compiler.linkflags += additional_libs
+    compiler.defines += additional_defines
+    compiler.cxxincludes += additional_includes
+
+    return compiler
+
+  def Library(self, cxx, name):
+    binary = cxx.Library(name)
+    return binary
+
+  def HL2Library(self, context, compiler, name, sdk):
+    compiler = self.HL2Compiler(context, compiler, sdk)
+    
+    if compiler.target.platform == 'linux':
+      if sdk.name == 'episode1':
+        lib_folder = os.path.join(sdk.path, 'linux_sdk')
+      elif sdk.name in ['sdk2013', 'bms', 'pvkii']:
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
+      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')
+    elif compiler.target.platform == 'mac':
+      if sdk.name in ['sdk2013', 'bms']:
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
+      elif compiler.target.arch == 'x86_64':
+        lib_folder = os.path.join(sdk.path, 'lib', 'osx64')
+      else:
+        lib_folder = os.path.join(sdk.path, 'lib', 'mac')
+
+    if compiler.target.platform in ['linux', 'mac']:
+      if sdk.name in ['sdk2013', 'bms', 'pvkii'] or compiler.target.arch == 'x86_64':
+        tier1 = os.path.join(lib_folder, 'tier1.a')
+      else:
+        tier1 = os.path.join(lib_folder, 'tier1_i486.a')
+      if sdk.name == 'mock' and compiler.target.platform == 'linux':
+        compiler.linkflags += ['-Wl,-z,origin']
+      compiler.postlink += [tier1]
+
+      if sdk.name in ['blade', 'insurgency', 'doi', 'csgo', 'cs2', 'dota']:
+        if compiler.target.arch == 'x86_64':
+          compiler.postlink += [os.path.join(lib_folder, 'interfaces.a')]
+        else:
+          compiler.postlink += [os.path.join(lib_folder, 'interfaces_i486.a')]
+      
+      if sdk.name == 'bms':
+        compiler.postlink += [os.path.join(lib_folder, 'mathlib.a')]
+
+    binary = self.Library(compiler, name)
+    compiler = binary.compiler
+
+    dynamic_libs = []
+    if compiler.target.platform == 'linux':
+      compiler.linkflags[0:0] = ['-lm']
+      if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']:
+        dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
+      elif compiler.target.arch == 'x86_64' and sdk.name in ['csgo', 'mock']:
+        dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so']
+      elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo', 'cs2', 'dota', 'pvkii']:
+        dynamic_libs = ['libtier0.so']
+        if sdk.name not in ['dota', 'cs2']:
+          dynamic_libs += ['libvstdlib.so']
+      else:
+        dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
+      if sdk.name in ['csgo', 'blade']:
+        compiler.defines += ['_GLIBCXX_USE_CXX11_ABI=0']
+    elif compiler.target.platform == 'mac':
+      binary.compiler.linkflags.append('-liconv')
+      dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
+    elif compiler.target.platform == 'windows':
+      libs = ['tier0', 'tier1', 'mathlib']
+      if sdk.name not in ['dota', 'cs2']:
+        libs += ['vstdlib']
+      if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'mcv', 'csgo', 'cs2', 'dota']:
+        libs.append('interfaces')
+      for lib in libs:
+        if compiler.target.arch == 'x86':
+          lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
+        elif compiler.target.arch == 'x86_64':
+          lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
+        binary.compiler.linkflags.append(lib_path)
+
+    for library in dynamic_libs:
+      source_path = os.path.join(lib_folder, library)
+      output_path = os.path.join(binary.localFolder, library)
+
+      context.AddFolder(binary.localFolder)
+      output = context.AddSymlink(source_path, output_path)
+
+      binary.compiler.weaklinkdeps += [output]
+      binary.compiler.linkflags[0:0] = [library]
+
+    return binary
+
+MMSPlugin = MMSPluginConfig()
+MMSPlugin.detectSDKs()
+MMSPlugin.configure()
+
+BuildScripts = [
+  'AMBuilder',
+  'PackageScript',
+]
+
+builder.Build(BuildScripts, { 'MMSPlugin': MMSPlugin })

AMBuilder

@@ -0,0 +1,33 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: 
+import os
+
+# Here only one sdk should be available to generate only one executable in the end,
+# as multi-sdk loading isn't supported out of the box by metamod, and would require specifying the full path in the vdf
+# which in the end would ruin the multi-platform (unix, win etc) loading by metamod as it won't be able to append platform specific extension
+# so just fall back to the single binary.
+# Multi-sdk solutions should be manually loaded with a custom plugin loader (examples being sourcemod, stripper:source)
+for sdk_name in MMSPlugin.sdks:
+  for cxx in MMSPlugin.all_targets:
+    sdk = MMSPlugin.sdks[sdk_name]
+
+    if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
+      continue
+
+    binary = MMSPlugin.HL2Library(builder, cxx, MMSPlugin.plugin_name, sdk)
+
+    binary.sources += [
+      'MovementUnlocker.cpp',
+    ]
+
+    if sdk_name in ['dota', 'cs2']:
+      binary.sources += [
+      os.path.join(sdk.path, 'tier1', 'convar.cpp'),
+      os.path.join(sdk.path, 'public', 'tier0', 'memoverride.cpp'),
+    ]
+
+    if cxx.target.arch == 'x86':
+      binary.sources += ['sourcehook/sourcehook_hookmangen.cpp']
+    nodes = builder.Add(binary)
+    MMSPlugin.binaries += [nodes]
+    
+  break

Makefile

@@ -1,229 +0,0 @@
-# (C)2004-2010 Metamod:Source Development Team
-# Makefile written by David "BAILOPAN" Anderson
-
-###########################################
-### EDIT THESE PATHS FOR YOUR OWN SETUP ###
-###########################################
-
-HL2SDK_ORIG = ../../hl2sdk
-HL2SDK_OB = ../../hl2sdk-ob
-HL2SDK_CSS = ../../hl2sdk-css
-HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve
-HL2SDK_L4D = ../../hl2sdk-l4d
-HL2SDK_L4D2 = ../../hl2sdk-l4d2
-HL2SDK_CSGO = ../../hl2sdk-csgo
-MMSOURCE19 = ..
-
-#####################################
-### EDIT BELOW FOR OTHER PROJECTS ###
-#####################################
-
-PROJECT = MovementUnlocker
-OBJECTS = MovementUnlocker.cpp
-
-##############################################
-### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
-##############################################
-
-OPT_FLAGS = -O3 -funroll-loops -pipe
-GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11
-DEBUG_FLAGS = -g -ggdb3 -D_DEBUG
-CPP = gcc
-CPP_OSX = clang
-
-##########################
-### SDK CONFIGURATIONS ###
-##########################
-
-override ENGSET = false
-
-# Check for valid list of engines
-ifneq (,$(filter original orangebox orangeboxvalve css left4dead left4dead2 csgo,$(ENGINE)))
-	override ENGSET = true
-endif
-
-ifeq "$(ENGINE)" "original"
-	HL2SDK = $(HL2SDK_ORIG)
-	CFLAGS += -DSOURCE_ENGINE=1
-endif
-ifeq "$(ENGINE)" "orangebox"
-	HL2SDK = $(HL2SDK_OB)
-	CFLAGS += -DSOURCE_ENGINE=3
-endif
-ifeq "$(ENGINE)" "css"
-	HL2SDK = $(HL2SDK_CSS)
-	CFLAGS += -DSOURCE_ENGINE=6
-endif
-ifeq "$(ENGINE)" "orangeboxvalve"
-	HL2SDK = $(HL2SDK_OB_VALVE)
-	CFLAGS += -DSOURCE_ENGINE=7
-endif
-ifeq "$(ENGINE)" "left4dead"
-	HL2SDK = $(HL2SDK_L4D)
-	CFLAGS += -DSOURCE_ENGINE=8
-endif
-ifeq "$(ENGINE)" "left4dead2"
-	HL2SDK = $(HL2SDK_L4D2)
-	CFLAGS += -DSOURCE_ENGINE=9
-endif
-ifeq "$(ENGINE)" "csgo"
-	HL2SDK = $(HL2SDK_CSGO)
-	CFLAGS += -DSOURCE_ENGINE=12
-endif
-
-HL2PUB = $(HL2SDK)/public
-
-ifeq "$(ENGINE)" "original"
-	INCLUDE += -I$(HL2SDK)/public/dlls
-	METAMOD = $(MMSOURCE19)/core-legacy
-else
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	METAMOD = $(MMSOURCE19)/core
-endif
-
-OS := $(shell uname -s)
-
-ifeq "$(OS)" "Darwin"
-	LIB_EXT = dylib
-	ifeq "$(ENGINE)" "csgo"
-		HL2LIB = $(HL2SDK)/lib/osx64
-	else
-		HL2LIB = $(HL2SDK)/lib/mac
-	endif
-else
-	LIB_EXT = so
-	ifeq "$(ENGINE)" "original"
-		HL2LIB = $(HL2SDK)/linux_sdk
-	else
-		HL2LIB = $(HL2SDK)/lib/linux
-	endif
-endif
-
-# if ENGINE is original or OB
-ifneq (,$(filter original orangebox,$(ENGINE)))
-	LIB_SUFFIX = _i486.$(LIB_EXT)
-else
-	LIB_PREFIX = lib
-	ifneq (,$(filter orangeboxvalve css left4dead2,$(ENGINE)))
-		ifneq "$(OS)" "Darwin"
-			LIB_SUFFIX = _srv.$(LIB_EXT)
-		else
-			LIB_SUFFIX = .$(LIB_EXT)
-		endif
-	else
-		LIB_SUFFIX = .$(LIB_EXT)
-	endif
-endif
-
-ifeq "$(OS)" "Darwin"
-	ifeq "$(ENGINE)" "csgo"
-		STATIC_SUFFIX = 
-	else
-		STATIC_SUFFIX = _i486
-	endif
-else
-	STATIC_SUFFIX = _i486
-endif
-
-CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
-	-DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
-	-DSE_PORTAL2=11 -DSE_CSGO=12
-
-LINK += $(HL2LIB)/tier1$(STATIC_SUFFIX).a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX)
-
-ifeq "$(ENGINE)" "csgo"
-	LINK += $(HL2LIB)/interfaces$(STATIC_SUFFIX).a
-endif
-
-INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
-	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -I$(METAMOD) -I$(METAMOD)/sourcehook
-
-################################################
-### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
-################################################
-
-BINARY = $(PROJECT).$(LIB_EXT)
-
-ifeq "$(DEBUG)" "true"
-	BIN_DIR = Debug.$(ENGINE)
-	CFLAGS += $(DEBUG_FLAGS)
-else
-	BIN_DIR = Release.$(ENGINE)
-	CFLAGS += $(OPT_FLAGS)
-endif
-
-ifeq "$(OS)" "Darwin"
-	CPP = $(CPP_OSX)
-	LIB_EXT = dylib
-	CFLAGS += -DOSX -D_OSX -mmacosx-version-min=10.9
-	LINK += -dynamiclib -lc++ -mmacosx-version-min=10.9
-	ifeq "$(ENGINE)" "csgo"
-		CFLAGS += -m64 -DX64BITS -DPLATFORM_64BITS
-		LINK += -m64
-	else
-		CFLAGS += -m32
-		LINK += -m32
-	endif
-else
-	LIB_EXT = so
-	CFLAGS += -D_LINUX -m32
-	LINK += -shared -m32
-endif
-
-IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0")
-
-ifeq "$(IS_CLANG)" "1"
-	CPP_MAJOR := $(shell $(CPP) --version | grep clang | sed "s/.*version \([0-9]\)*\.[0-9]*.*/\1/")
-	CPP_MINOR := $(shell $(CPP) --version | grep clang | sed "s/.*version [0-9]*\.\([0-9]\)*.*/\1/")
-else
-	CPP_MAJOR := $(shell $(CPP) -dumpversion >&1 | cut -b1)
-	CPP_MINOR := $(shell $(CPP) -dumpversion >&1 | cut -b3)
-endif
-
-CFLAGS += -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
-	-Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
-	-Dstrcmpi=strcasecmp -DCOMPILER_GCC -Wall -Wno-non-virtual-dtor -Wno-overloaded-virtual \
-	-fPIC -fno-exceptions -fno-rtti -msse -fno-strict-aliasing
-
-# Clang || GCC >= 4
-ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
-	CFLAGS += $(GCC4_FLAGS)
-endif
-
-# Clang >= 3 || GCC >= 4.7
-ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor -Wno-unused-private-field -Wno-deprecated-register
-endif
-
-# OS is Linux and not using clang
-ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1"
-	LINK += -static-libgcc
-endif
-
-OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
-
-$(BIN_DIR)/%.o: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
-
-all: check
-	mkdir -p $(BIN_DIR)
-	ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX)
-	ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX)
-	$(MAKE) -f Makefile MovementUnlocker
-	
-check:
-	if [ "$(ENGSET)" = "false" ]; then \
-		echo "You must supply one of the following values for ENGINE:"; \
-		echo "csgo, left4dead2, left4dead, css, orangeboxvalve, orangebox, or original"; \
-		exit 1; \
-	fi
-
-MovementUnlocker: check $(OBJ_BIN)
-	$(CPP) $(INCLUDE) $(OBJ_BIN) $(LINK) -ldl -lm -o $(BIN_DIR)/$(BINARY)
-
-default: all
-
-clean: check
-	rm -rf $(BIN_DIR)/*.o
-	rm -rf $(BIN_DIR)/$(BINARY)
-

MovementUnlocker.cpp

@@ -1,19 +1,20 @@
 #include <stdio.h>
 #include "MovementUnlocker.h"
-#include <cstdint>
 #include <sh_memory.h>
 #ifdef _WIN32
 #include <Windows.h>
+#elif __linux__
+#include <dlfcn.h>
 #endif
 
 MovementUnlocker g_MovementUnlocker;
 
 #ifdef _WIN32
-const unsigned char *pPatchSignature = (unsigned char *)"\x76\x58\xF3\x0F\x10\x40\x44\xF3\x0F\x10\x50\x40";
+const unsigned char *pPatchSignature = (unsigned char *)"\x76\x2A\xF2\x0F\x10\x57\x3C\xF3\x0F\x10\x47\x44\x0F\x28\xCA\xF3\x0F\x59\xC0";
-const char *pPatchPattern = "x?xxxxxxxxxx";
+const char *pPatchPattern = "x?xxxxxxxxxxxxxxxxx";
 #elif __linux__
-unsigned char * pPatchSignature = (unsigned char *)"\x76\x45\xF3\x0F\x11\x9D\x4C\xFF\xFF\xFF";
+const unsigned char * pPatchSignature = (unsigned char *)"\x0F\x87\x2A\x2A\x2A\x2A\x49\x8B\x7C\x24\x30\xE8\x2A\x2A\x2A\x2A\x66\x0F\xEF\xED";
-const char* pPatchPattern = "x?xxxxxxxx";
+const char* pPatchPattern = "xx????xxxxxx????xxxx";
 #endif
 
 // From https://git.botox.bz/CSSZombieEscape/sm-ext-PhysHooks
@@ -54,12 +55,13 @@ PLUGIN_EXPOSE(MovementUnlocker, g_MovementUnlocker);
 bool MovementUnlocker::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen, bool late)
 {
 	PLUGIN_SAVEVARS();
+
 	int PatchLen = strlen(pPatchPattern);
 #ifdef _WIN32
-	char *pBinPath = "csgo/bin/server.dll";
+	char const *pBinPath = "csgo/bin/win64/server.dll";
 	auto *pBin = LoadLibrary(pBinPath);
 #elif __linux__
-	char *pBinPath = "csgo/bin/server.so";
+	char const *pBinPath = "csgo/bin/linuxsteamrt64/libserver.so";
 	auto *pBin = dlopen(pBinPath, RTLD_NOW);
 #endif
 
@@ -83,9 +85,22 @@ bool MovementUnlocker::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxl
 		return false;
 	}
 
+#ifdef _WIN32
 	SourceHook::SetMemAccess((void*)pPatchAddress, PatchLen, SH_MEM_READ | SH_MEM_WRITE | SH_MEM_EXEC);
 	*(unsigned char*)(pPatchAddress) = ((unsigned char*)"\xEB")[0];
 	SourceHook::SetMemAccess((void*)pPatchAddress, PatchLen, SH_MEM_READ | SH_MEM_EXEC);
+#elif __linux__
+	for (int i = 0; i < 5; i++)
+	{
+		SourceHook::SetMemAccess((void*)pPatchAddress, PatchLen, SH_MEM_READ | SH_MEM_WRITE | SH_MEM_EXEC);
+		*(unsigned char*)(pPatchAddress) = ((unsigned char*)"\x90")[i];
+		SourceHook::SetMemAccess((void*)pPatchAddress, PatchLen, SH_MEM_READ | SH_MEM_EXEC);
+
+		pPatchAddress++;
+	}
+#endif
+
+	META_CONPRINTF( "[Movement Unlocker] Successfully patched Movement Unlocker!\n" );
 
 	return true;
 }
@@ -136,7 +151,7 @@ const char *MovementUnlocker::GetAuthor()
 
 const char *MovementUnlocker::GetDescription()
 {
-	return "CS2 MM:S port of Movement Unlocker, removes max speed limitation from players on the ground.";
+	return "CS2 MM:S port of Movement Unlocker, removes max speed limitation from players on the ground";
 }
 
 const char *MovementUnlocker::GetName()

MovementUnlocker.h

@@ -3,11 +3,7 @@
 
 #include <ISmmPlugin.h>
 
-#if defined WIN32 && !defined snprintf
+class MovementUnlocker : public ISmmPlugin, public IMetamodListener
-#define snprintf _snprintf
-#endif
-
-class MovementUnlocker : public ISmmPlugin
 {
 public:
 	bool Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen, bool late);

MovementUnlocker.vdf

@@ -1,5 +0,0 @@
-"Metamod Plugin"
-{
-	"alias"		"MovementUnlocker"
-	"file"		"addons/MovementUnlocker"
-}

PackageScript

@@ -0,0 +1,49 @@
+# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+import os
+
+builder.SetBuildFolder('package')
+
+metamod_folder = builder.AddFolder(os.path.join('addons', 'metamod'))
+bin_folder_path = os.path.join('addons', MMSPlugin.plugin_name, 'bin')
+bin_folder = builder.AddFolder(bin_folder_path)
+
+for cxx in MMSPlugin.all_targets:
+  if cxx.target.arch == 'x86_64':
+    if cxx.target.platform == 'windows':
+      bin64_folder_path = os.path.join('addons', MMSPlugin.plugin_name, 'bin', 'win64')
+      bin64_folder = builder.AddFolder(bin64_folder_path)
+    elif cxx.target.platform == 'linux':
+      bin64_folder_path = os.path.join('addons', MMSPlugin.plugin_name, 'bin', 'linuxsteamrt64')
+      bin64_folder = builder.AddFolder(bin64_folder_path)
+    elif cxx.target.platform == 'mac':
+      bin64_folder_path = os.path.join('addons', MMSPlugin.plugin_name, 'bin', 'osx64')
+      bin64_folder = builder.AddFolder(bin64_folder_path)
+
+pdb_list = []
+for task in MMSPlugin.binaries:
+  # This hardly assumes there's only 1 targetted platform and would be overwritten
+  # with whatever comes last if multiple are used!
+  with open(os.path.join(builder.buildPath, MMSPlugin.plugin_name + '.vdf'), 'w') as fp:
+    fp.write('"Metamod Plugin"\n')
+    fp.write('{\n')
+    fp.write(f'\t"alias"\t"{MMSPlugin.plugin_alias}"\n')
+    if task.target.arch == 'x86_64':
+      fp.write(f'\t"file"\t"{os.path.join(bin64_folder_path, MMSPlugin.plugin_name)}"\n')
+    else:
+      fp.write(f'\t"file"\t"{os.path.join(bin_folder_path, MMSPlugin.plugin_name)}"\n')
+    fp.write('}\n')
+
+  if task.target.arch == 'x86_64':
+    builder.AddCopy(task.binary, bin64_folder)
+  else:
+    builder.AddCopy(task.binary, bin_folder)
+
+  if task.debug:
+    pdb_list.append(task.debug)
+
+builder.AddCopy(os.path.join(builder.buildPath, MMSPlugin.plugin_name + '.vdf'), metamod_folder)
+
+# Generate PDB info.
+with open(os.path.join(builder.buildPath, 'pdblog.txt'), 'wt') as fp:
+  for line in pdb_list:
+    fp.write(line.path + '\n')

configure.py

@@ -0,0 +1,39 @@
+# 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)
+
+# Hack to show a decent upgrade message, which wasn't done until 2.2.
+ambuild_version = getattr(run, 'CURRENT_API', '2.1')
+if ambuild_version.startswith('2.1'):
+  sys.stderr.write("AMBuild 2.2 or higher is required; please update\n")
+  sys.exit(1)
+
+parser = run.BuildParser(sourcePath=sys.path[0], api='2.2')
+parser.options.add_argument('-n', '--plugin-name', type=str, dest='plugin_name', default=None,
+                       help='Plugin name')
+parser.options.add_argument('-a', '--plugin-alias', type=str, dest='plugin_alias', default=None,
+                       help='Plugin alias')
+parser.options.add_argument('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
+                       help='Root search folder for HL2SDKs')
+parser.options.add_argument('--mms_path', type=str, dest='mms_path', default=None,
+                       help='Metamod:Source source tree folder')
+parser.options.add_argument('--enable-debug', action='store_const', const='1', dest='debug',
+                       help='Enable debugging symbols')
+parser.options.add_argument('--enable-optimize', action='store_const', const='1', dest='opt',
+                       help='Enable optimization')
+parser.options.add_argument('-s', '--sdks', default='all', dest='sdks',
+                       help='Build against specified SDKs; valid args are "all", "present", or '
+                            'comma-delimited list of engine names (default: "all")')
+parser.options.add_argument('--targets', type=str, dest='targets', default=None,
+                            help="Override the target architecture (use commas to separate multiple targets).")
+parser.Configure()

msvc10/MovementUnlocker.filters

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\MovementUnlocker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\MovementUnlocker.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

msvc10/MovementUnlocker.sln

@@ -1,61 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33110.190
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MovementUnlocker", "MovementUnlocker.vcxproj", "{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug - Alien Swarm|Win32 = Debug - Alien Swarm|Win32
-		Debug - Dark Messiah|Win32 = Debug - Dark Messiah|Win32
-		Debug - Left 4 Dead 2|Win32 = Debug - Left 4 Dead 2|Win32
-		Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32
-		Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32
-		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
-		Debug - Original|Win32 = Debug - Original|Win32
-		Release - Alien Swarm|Win32 = Release - Alien Swarm|Win32
-		Release - Dark Messiah|Win32 = Release - Dark Messiah|Win32
-		Release - Left 4 Dead 2|Win32 = Release - Left 4 Dead 2|Win32
-		Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32
-		Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32
-		Release - Orange Box|Win32 = Release - Orange Box|Win32
-		Release - Original|Win32 = Release - Original|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Alien Swarm|Win32.ActiveCfg = Release - CS GO|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Alien Swarm|Win32.Build.0 = Release - CS GO|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Dark Messiah|Win32.ActiveCfg = Debug - Dark Messiah|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Dark Messiah|Win32.Build.0 = Debug - Dark Messiah|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Left 4 Dead 2|Win32.ActiveCfg = Debug - Left 4 Dead 2|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Left 4 Dead 2|Win32.Build.0 = Debug - Left 4 Dead 2|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Left 4 Dead|Win32.ActiveCfg = Debug - Left 4 Dead|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Left 4 Dead|Win32.Build.0 = Debug - Left 4 Dead|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Original|Win32.ActiveCfg = Debug - Original|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Debug - Original|Win32.Build.0 = Debug - Original|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Alien Swarm|Win32.ActiveCfg = Release - Alien Swarm|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Alien Swarm|Win32.Build.0 = Release - Alien Swarm|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Dark Messiah|Win32.ActiveCfg = Release - Dark Messiah|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Dark Messiah|Win32.Build.0 = Release - Dark Messiah|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Left 4 Dead 2|Win32.ActiveCfg = Release - Left 4 Dead 2|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Left 4 Dead 2|Win32.Build.0 = Release - Left 4 Dead 2|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Left 4 Dead|Win32.ActiveCfg = Release - Left 4 Dead|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Left 4 Dead|Win32.Build.0 = Release - Left 4 Dead|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Original|Win32.ActiveCfg = Release - Original|Win32
-		{EA8E7106-8D09-46A1-881B-FFBC4B8532F2}.Release - Original|Win32.Build.0 = Release - Original|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D07B34A6-F620-4C4B-A04D-E54EB9D32D97}
-	EndGlobalSection
-EndGlobal

msvc10/MovementUnlocker.vcxproj.user

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>