diff --git a/.gitignore b/.gitignore
index 23f431fe..d993998e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,8 @@ obj-*/
*.swp
*.gdb_history
objdir
+# Not standardized, but common name for build directories
+build*/
.vs/*
.vscode/*
diff --git a/.gitmodules b/.gitmodules
index e799562e..ca605caa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,6 @@
path = sourcepawn
url = https://github.com/alliedmodders/sourcepawn
shallow = true
+[submodule "hl2sdk-manifests"]
+ path = hl2sdk-manifests
+ url = https://github.com/alliedmodders/hl2sdk-manifests.git
diff --git a/AMBuildScript b/AMBuildScript
index 0d6e771f..50af518b 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -2,87 +2,6 @@
import collections
import os, sys
import subprocess
-import traceback
-
-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.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, 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']
-Blade = {
- 'windows': ['x86', 'x86_64'],
- 'linux': ['x86_64'],
- 'mac': ['x86_64']
-}
-CSGO = {
- 'windows': ['x86'],
- 'linux': ['x86', 'x86_64'],
- 'mac': ['x86_64']
-}
-MCV = {
- 'windows': ['x86_64'],
- 'linux': ['x86_64'],
-}
-Mock = {
- 'windows': ['x86', 'x86_64'],
- 'linux': ['x86', 'x86_64'],
- 'mac': ['x86_64']
-}
-
-SDKMap = {
- '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', MCV, 'mcv'),
- 'csgo': SDK('HL2SDKCSGO', '2.csgo', '23', 'CSGO', CSGO, 'csgo'),
- 'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '18', 'PORTAL2', [], 'portal2'),
- 'blade': SDK('HL2SDKBLADE', '2.blade', '21', 'BLADE', Blade, 'blade'),
- 'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'),
- 'contagion': SDK('HL2SDKCONTAGION', '2.contagion', '15', 'CONTAGION', WinOnly, 'contagion'),
- 'bms': SDK('HL2SDKBMS', '2.bms', '11', 'BMS', WinLinux, 'bms'),
- 'doi': SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'),
- 'mock': SDK('HL2SDK-MOCK', '2.mock', '999', 'MOCK', Mock, 'mock'),
- 'pvkii': SDK('HL2SDKPVKII', '2.pvkii', '10', 'PVKII', WinLinux, 'pvkii'),
-}
-
-# Stable sorting for command equivalence in AMBuild.
-PossibleSDKs = collections.OrderedDict()
-for key in sorted(SDKMap.keys()):
- PossibleSDKs[key] = SDKMap[key]
def ResolveEnvPath(env, folder):
if env in os.environ:
@@ -113,9 +32,15 @@ def SetArchFlags(compiler):
if compiler.target.arch == 'x86_64':
compiler.defines += ['WIN64']
+SdkHelpers = builder.Eval('hl2sdk-manifests/SdkHelpers.ambuild', {
+ 'Project': 'sourcemod'
+})
+
class SMConfig(object):
def __init__(self):
+ self.sdk_manifests = []
self.sdks = {}
+ self.sdk_targets = []
self.binaries = []
self.spvm = []
self.extensions = []
@@ -178,29 +103,26 @@ class SMConfig(object):
major, minor, release = m.groups()
self.productVersion = '{0}.{1}.{2}'.format(major, minor, release)
+ def findSdkPath(self, sdk_name):
+ dir_name = 'hl2sdk-{}'.format(sdk_name)
+ if builder.options.hl2sdk_root:
+ sdk_path = os.path.join(builder.options.hl2sdk_root, dir_name)
+ if os.path.exists(sdk_path):
+ return sdk_path
+ return ResolveEnvPath('HL2SDK{}'.format(sdk_name.upper()), dir_name)
+
+ def shouldIncludeSdk(self, sdk):
+ return not sdk.get('source2', False)
+
def detectSDKs(self):
- sdk_list = builder.options.sdks.split(',')
- use_none = sdk_list[0] == 'none'
- use_all = sdk_list[0] == 'all'
- use_present = sdk_list[0] == 'present'
+ sdk_list = [s for s in builder.options.sdks.split(',') if s]
+ SdkHelpers.sdk_filter = self.shouldIncludeSdk
+ SdkHelpers.find_sdk_path = self.findSdkPath
+ SdkHelpers.findSdks(builder, self.all_targets, sdk_list)
- 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)
- else:
- sdk_path = ResolveEnvPath(sdk.envvar, sdk.folder)
- if sdk_path is None or not os.path.isdir(sdk_path):
- 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))
- continue
- if use_all or use_present or sdk_name in sdk_list:
- sdk.path = Normalize(sdk_path)
- self.sdks[sdk_name] = sdk
-
- if len(self.sdks) < 1 and len(sdk_list) and not use_none:
- raise Exception('No applicable SDKs were found, nothing to do')
+ self.sdks = SdkHelpers.sdks
+ self.sdk_manifests = SdkHelpers.sdk_manifests
+ self.sdk_targets = SdkHelpers.sdk_targets
if builder.options.mms_path:
self.mms_root = builder.options.mms_path
@@ -460,7 +382,7 @@ class SMConfig(object):
self.asan_libs[cxx.target.arch] = os.path.dirname(output)
def configure_linux(self, cxx):
- cxx.defines += ['_LINUX', 'POSIX', '_FILE_OFFSET_BITS=64']
+ cxx.defines += ['LINUX', '_LINUX', 'POSIX', '_FILE_OFFSET_BITS=64']
cxx.linkflags += ['-lm']
if cxx.family == 'gcc':
cxx.linkflags += ['-static-libgcc']
@@ -591,152 +513,10 @@ class SMConfig(object):
os.path.join(self.mms_root, 'core', 'sourcehook'),
]
- defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs]
- compiler.defines += defines
+ for other_sdk in self.sdk_manifests:
+ compiler.defines += ['SE_{}={}'.format(other_sdk['define'], other_sdk['code'])]
- 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(['public', 'toolframework'])
- 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.like('msvc'):
- compiler.defines += ['COMPILER_MSVC']
- if compiler.target.arch == 'x86':
- compiler.defines += ['COMPILER_MSVC32']
- elif compiler.target.arch == 'x86_64':
- compiler.defines += ['COMPILER_MSVC64']
- compiler.linkflags += ['legacy_stdio_definitions.lib']
- else:
- compiler.defines += ['COMPILER_GCC']
-
- if compiler.target.arch == 'x86_64':
- compiler.defines += ['X64BITS', 'PLATFORM_64BITS']
-
- # 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', 'mcv', 'csgo']:
- compiler.defines += ['NETWORK_VARS_ENABLED']
-
- if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'pvkii']:
- if compiler.target.platform in ['linux', 'mac']:
- compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
-
- if compiler.target.platform == 'linux':
- if sdk.name in ['csgo', 'blade']:
- compiler.linkflags.remove('-static-libstdc++')
- compiler.linkflags += ['-lstdc++']
- compiler.defines += ['_GLIBCXX_USE_CXX11_ABI=0']
- elif compiler.target.platform == 'mac':
- if sdk.name in ['csgo']:
- # Switch libc++ to libstdc++ for protobuf linkage.
- compiler.cxxflags.remove('-stdlib=libc++')
- compiler.linkflags.remove('-stdlib=libc++')
- compiler.linkflags.remove('-lc++')
-
- compiler.cxxflags += ['-stdlib=libstdc++']
- compiler.linkflags += ['-stdlib=libstdc++']
- compiler.linkflags += ['-lstdc++']
-
- if 'c++1y' in compiler.cxxflags:
- compiler.cxxflags.remove('-std=c++1y')
- compiler.cxxflags += ['-std=c++11']
- elif 'c++14' in compiler.cxxflags:
- compiler.cxxflags.remove('-std=c++14')
- compiler.cxxflags += ['-std=c++11']
-
- for path in paths:
- compiler.cxxincludes += [os.path.join(sdk.path, *path)]
-
- 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', 'pvkii']:
- 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':
- compiler.postlink += [
- os.path.join(lib_folder, 'tier1.a'),
- os.path.join(lib_folder, 'mathlib.a')
- ]
- else:
- compiler.postlink += [
- os.path.join(lib_folder, 'tier1_i486.a'),
- os.path.join(lib_folder, 'mathlib_i486.a')
- ]
-
- if sdk.name in ['blade', 'insurgency', 'doi', 'mcv', 'csgo']:
- 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')]
-
- dynamic_libs = []
- if compiler.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 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', 'pvkii', 'mcv']:
- dynamic_libs = ['libtier0.so', 'libvstdlib.so']
- else:
- dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
- elif compiler.target.platform == 'mac':
- compiler.linkflags.append('-liconv')
- dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
- elif compiler.target.platform == 'windows':
- libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
- if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'mcv', 'csgo']:
- 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'
- 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)
-
- # Ensure the output path exists.
- context.AddFolder(binary.localFolder)
- output = context.AddSymlink(source_path, output_path)
-
- compiler.weaklinkdeps += [output]
- compiler.linkflags[0:0] = [library]
+ SdkHelpers.configureCxx(context, binary, sdk)
return binary
@@ -747,14 +527,14 @@ class SMConfig(object):
def HL2Config(self, project, context, compiler, name, sdk):
binary = project.Configure(compiler, name,
- '{0} - {1} {2}'.format(self.tag, sdk.name, compiler.target.arch))
+ '{0} - {1} {2}'.format(self.tag, sdk['name'], compiler.target.arch))
self.AddCxxCompat(binary)
self.AddVersioning(binary)
return self.ConfigureForHL2(context, binary, sdk)
def HL2ExtConfig(self, project, context, compiler, name, sdk):
binary = project.Configure(compiler, name,
- '{0} - {1} {2}'.format(self.tag, sdk.name, compiler.target.arch))
+ '{0} - {1} {2}'.format(self.tag, sdk['name'], compiler.target.arch))
self.AddCxxCompat(binary)
self.AddVersioning(binary)
self.ConfigureForHL2(context, binary, sdk)
diff --git a/core/AMBuilder b/core/AMBuilder
index 181379c5..2a5ea0d0 100644
--- a/core/AMBuilder
+++ b/core/AMBuilder
@@ -56,90 +56,86 @@ pb_gamesrcdir_map = {
'mcv': 'vietnam',
}
-for sdk_name in SM.sdks:
- sdk = SM.sdks[sdk_name]
- for cxx in builder.targets:
- if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
- continue
+for sdk_target in SM.sdk_targets:
+ sdk = sdk_target.sdk
+ cxx = sdk_target.cxx
- binary_name = 'sourcemod.' + sdk.ext
- needs_protobuf = sdk.name in ['csgo', 'blade', 'mcv']
+ binary_name = 'sourcemod.' + sdk['extension']
+ needs_protobuf = sdk['name'] in ['csgo', 'blade', 'mcv']
- binary = SM.HL2Config(project, builder, cxx, binary_name, sdk)
- SM.ConfigureForExtension(builder, binary.compiler)
+ binary = SM.HL2Config(project, builder, cxx, binary_name, sdk)
+ SM.ConfigureForExtension(builder, binary.compiler)
- compiler = binary.compiler
+ compiler = binary.compiler
+ compiler.cxxincludes += [
+ builder.sourcePath
+ ]
+
+ if needs_protobuf:
compiler.cxxincludes += [
- builder.sourcePath
+ os.path.join(sdk['path'], 'common', 'protobuf-2.5.0', 'src'),
+ os.path.join(sdk['path'], 'public', 'engine', 'protobuf'),
+ os.path.join(sdk['path'], 'public', 'game', 'shared', pb_gamedir_map[sdk['name']], 'protobuf')
+ ]
+
+ if compiler.like('msvc'):
+ compiler.defines += ['_ALLOW_KEYWORD_MACROS']
+ if cxx.target.platform == 'linux':
+ compiler.postlink += ['-lpthread', '-lrt']
+
+ if needs_protobuf:
+ if compiler.target.platform == 'linux':
+ if compiler.target.arch == 'x86':
+ lib_path = os.path.join(sdk['path'], 'lib', 'linux32', 'release', 'libprotobuf.a')
+ elif compiler.target.arch == 'x86_64':
+ lib_path = os.path.join(sdk['path'], 'lib', 'linux64', 'release', 'libprotobuf.a')
+ compiler.linkflags += ['-Wl,--exclude-libs=libprotobuf.a']
+ elif compiler.target.platform == 'mac':
+ if compiler.target.arch == 'x86':
+ lib_path = os.path.join(sdk['path'], 'lib', 'osx32', 'release', 'libprotobuf.a')
+ elif compiler.target.arch == 'x86_64':
+ lib_path = os.path.join(sdk['path'], 'lib', 'osx64', 'release', 'libprotobuf.a')
+ elif compiler.target.platform == 'windows':
+ msvc_ver = compiler.version
+ vs_year = ''
+ platform = ''
+ if compiler.target.arch == 'x86':
+ platform = 'win32'
+ elif compiler.target.arch == 'x86_64':
+ platform = 'win64'
+
+ if 1900 <= msvc_ver < 2000:
+ vs_year = '2015'
+ else:
+ raise Exception('Cannot find libprotobuf for MSVC version "' + str(compiler.version) + '"')
+
+ if 'DEBUG' in compiler.defines:
+ lib_path = os.path.join(sdk['path'], 'lib', platform, 'debug', 'vs' + vs_year, 'libprotobuf.lib')
+ else:
+ lib_path = os.path.join(sdk['path'], 'lib', platform, 'release', 'vs' + vs_year, 'libprotobuf.lib')
+ compiler.linkflags.insert(0, lib_path)
+
+ if needs_protobuf:
+ binary.sources += ['smn_protobuf.cpp']
+ else:
+ binary.sources += ['smn_bitbuffer.cpp']
+
+ if sdk['name'] != 'blade':
+ binary.sources += [
+ 'vprof_tool.cpp',
]
- if needs_protobuf:
- compiler.cxxincludes += [
- os.path.join(sdk.path, 'common', 'protobuf-2.5.0', 'src'),
- os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
- os.path.join(sdk.path, 'public', 'game', 'shared', pb_gamedir_map[sdk.name], 'protobuf')
- ]
-
- if compiler.like('msvc'):
- compiler.defines += ['_ALLOW_KEYWORD_MACROS']
- if needs_protobuf and compiler.like('gcc'):
- compiler.defines += ['_GLIBCXX_USE_CXX11_ABI=0']
- if cxx.target.platform == 'linux':
- compiler.postlink += ['-lpthread', '-lrt']
-
- if needs_protobuf:
- if compiler.target.platform == 'linux':
- if compiler.target.arch == 'x86':
- lib_path = os.path.join(sdk.path, 'lib', 'linux32', 'release', 'libprotobuf.a')
- elif compiler.target.arch == 'x86_64':
- lib_path = os.path.join(sdk.path, 'lib', 'linux64', 'release', 'libprotobuf.a')
- compiler.linkflags += ['-Wl,--exclude-libs=libprotobuf.a']
- elif compiler.target.platform == 'mac':
- if compiler.target.arch == 'x86':
- lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a')
- elif compiler.target.arch == 'x86_64':
- lib_path = os.path.join(sdk.path, 'lib', 'osx64', 'release', 'libprotobuf.a')
- elif compiler.target.platform == 'windows':
- msvc_ver = compiler.version
- vs_year = ''
- platform = ''
- if compiler.target.arch == 'x86':
- platform = 'win32'
- elif compiler.target.arch == 'x86_64':
- platform = 'win64'
-
- if 1900 <= msvc_ver < 2000:
- vs_year = '2015'
- else:
- raise Exception('Cannot find libprotobuf for MSVC version "' + str(compiler.version) + '"')
-
- if 'DEBUG' in compiler.defines:
- lib_path = os.path.join(sdk.path, 'lib', platform, 'debug', 'vs' + vs_year, 'libprotobuf.lib')
- else:
- lib_path = os.path.join(sdk.path, 'lib', platform, 'release', 'vs' + vs_year, 'libprotobuf.lib')
- compiler.linkflags.insert(0, lib_path)
-
- if needs_protobuf:
- binary.sources += ['smn_protobuf.cpp']
- else:
- binary.sources += ['smn_bitbuffer.cpp']
-
- if sdk.name != 'blade':
+ if needs_protobuf:
+ binary.sources += [
+ os.path.join(sdk['path'], 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
+ os.path.join(sdk['path'], 'public', 'game', 'shared', pb_gamedir_map[sdk['name']], 'protobuf', pb_gamesrcdir_map[sdk['name']] + '_usermessages.pb.cc'),
+ os.path.join(sdk['path'], 'public', 'game', 'shared', pb_gamedir_map[sdk['name']], 'protobuf', pb_gamesrcdir_map[sdk['name']] + '_usermessage_helpers.cpp'),
+ ]
+ if sdk['name'] == 'mcv':
binary.sources += [
- 'vprof_tool.cpp',
+ os.path.join(sdk['path'], 'public', 'game', 'shared', pb_gamedir_map[sdk['name']], 'protobuf', pb_gamesrcdir_map[sdk['name']] + '_gcmessages.pb.cc'),
+ os.path.join(sdk['path'], 'public', 'engine', 'protobuf', 'engine_gcmessages.pb.cc'),
]
- if needs_protobuf:
- binary.sources += [
- os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
- os.path.join(sdk.path, 'public', 'game', 'shared', pb_gamedir_map[sdk.name], 'protobuf', pb_gamesrcdir_map[sdk.name] + '_usermessages.pb.cc'),
- os.path.join(sdk.path, 'public', 'game', 'shared', pb_gamedir_map[sdk.name], 'protobuf', pb_gamesrcdir_map[sdk.name] + '_usermessage_helpers.cpp'),
- ]
- if sdk.name == 'mcv':
- binary.sources += [
- os.path.join(sdk.path, 'public', 'game', 'shared', pb_gamedir_map[sdk.name], 'protobuf', pb_gamesrcdir_map[sdk.name] + '_gcmessages.pb.cc'),
- os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'engine_gcmessages.pb.cc'),
- ]
-
SM.binaries += builder.Add(project)
diff --git a/extensions/cstrike/AMBuilder b/extensions/cstrike/AMBuilder
index 3ecf07ff..d1f65409 100644
--- a/extensions/cstrike/AMBuilder
+++ b/extensions/cstrike/AMBuilder
@@ -29,31 +29,31 @@ for sdk_name in ['css', 'csgo']:
project.sources += ['rulesfix.cpp']
for cxx in builder.targets:
- if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
+ if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
continue
cxx.defines += ['HAVE_STRING_H']
- binary = SM.HL2ExtConfig(project, builder, cxx, 'game.cstrike.ext.' + sdk.ext, sdk)
+ binary = SM.HL2ExtConfig(project, builder, cxx, 'game.cstrike.ext.' + sdk['extension'], sdk)
if sdk_name == 'csgo':
compiler = binary.compiler
- compiler.cxxincludes += [os.path.join(sdk.path, 'public', 'steam')]
+ compiler.cxxincludes += [os.path.join(sdk['path'], 'public', 'steam')]
compiler.defines += ['VERSION_SAFE_STEAM_API_INTERFACES']
library_name = ''
if cxx.target.platform == 'windows':
- compiler.linkflags += [os.path.join(sdk.path, 'lib', 'public', 'steam_api.lib')]
+ compiler.linkflags += [os.path.join(sdk['path'], 'lib', 'public', 'steam_api.lib')]
elif cxx.target.platform == 'linux':
library_name = 'libsteam_api.so'
if cxx.target.arch == 'x86_64':
- source_path = os.path.join(sdk.path, 'lib', 'linux64')
+ source_path = os.path.join(sdk['path'], 'lib', 'linux64')
else:
- source_path = os.path.join(sdk.path, 'lib', 'linux')
+ source_path = os.path.join(sdk['path'], 'lib', 'linux')
elif cxx.target.platform == 'mac':
library_name = 'libsteam_api.dylib'
if cxx.target.arch == 'x86_64':
- source_path = os.path.join(sdk.path, 'lib', 'osx64')
+ source_path = os.path.join(sdk['path'], 'lib', 'osx64')
else:
- source_path = os.path.join(sdk.path, 'lib', 'mac')
+ source_path = os.path.join(sdk['path'], 'lib', 'mac')
if library_name:
source_path = os.path.join(source_path, library_name)
diff --git a/extensions/sdkhooks/AMBuilder b/extensions/sdkhooks/AMBuilder
index 1a18a995..13f5a0e3 100644
--- a/extensions/sdkhooks/AMBuilder
+++ b/extensions/sdkhooks/AMBuilder
@@ -14,13 +14,10 @@ for sdk_name in SM.sdks:
sdk = SM.sdks[sdk_name]
for cxx in builder.targets:
- if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
+ if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
continue
- binary = SM.HL2ExtConfig(project, builder, cxx, 'sdkhooks.ext.' + sdk.ext, sdk)
- binary.compiler.cxxincludes += [
- os.path.join(sdk.path, 'game', 'shared')
- ]
+ binary = SM.HL2ExtConfig(project, builder, cxx, 'sdkhooks.ext.' + sdk['extension'], sdk)
if binary.compiler.behavior == 'gcc':
binary.compiler.cxxflags += ['-Wno-invalid-offsetof']
diff --git a/extensions/sdktools/AMBuilder b/extensions/sdktools/AMBuilder
index 36d776ac..9f024b5d 100644
--- a/extensions/sdktools/AMBuilder
+++ b/extensions/sdktools/AMBuilder
@@ -37,22 +37,21 @@ project.sources += [
for sdk_name in SM.sdks:
sdk = SM.sdks[sdk_name]
- if sdk.name in ['mock']:
+ if sdk['name'] in ['mock']:
continue
for cxx in builder.targets:
- if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
+ if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
continue
- binary = SM.HL2ExtConfig(project, builder, cxx, 'sdktools.ext.' + sdk.ext, sdk)
+ binary = SM.HL2ExtConfig(project, builder, cxx, 'sdktools.ext.' + sdk['extension'], sdk)
binary.compiler.cxxincludes += [
- os.path.join(sdk.path, 'game', 'shared'),
os.path.join(builder.sourcePath, 'public', 'jit'),
os.path.join(builder.sourcePath, 'public', 'jit', 'x86'),
]
- binary.compiler.defines += ['HAVE_STRING_H'];
+ binary.compiler.defines += ['HAVE_STRING_H']
- if sdk.name != 'episode1':
+ if sdk['name'] != 'episode1':
binary.compiler.defines += ['HOOKING_ENABLED']
if binary.compiler.behavior == 'gcc':
diff --git a/extensions/tf2/AMBuilder b/extensions/tf2/AMBuilder
index 8114832c..2b3e9536 100644
--- a/extensions/tf2/AMBuilder
+++ b/extensions/tf2/AMBuilder
@@ -5,9 +5,9 @@ if 'tf2' in SM.sdks:
sdk = SM.sdks['tf2']
for cxx in builder.targets:
- if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
+ if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
continue
- binary = SM.HL2Library(builder, cxx, 'game.tf2.ext.' + sdk.ext, sdk)
+ binary = SM.HL2Library(builder, cxx, 'game.tf2.ext.' + sdk['extension'], sdk)
binary.sources += [
'extension.cpp',
'natives.cpp',
@@ -28,5 +28,5 @@ if 'tf2' in SM.sdks:
'../../public/libudis86/syn.c',
'../../public/libudis86/udis86.c',
]
- binary.compiler.defines += ['HAVE_STRING_H'];
+ binary.compiler.defines += ['HAVE_STRING_H']
SM.extensions += [builder.Add(binary)]
diff --git a/hl2sdk-manifests b/hl2sdk-manifests
new file mode 160000
index 00000000..fb0d3ed7
--- /dev/null
+++ b/hl2sdk-manifests
@@ -0,0 +1 @@
+Subproject commit fb0d3ed7ba27fb27abd4a44c058f5c3c2c33be15