mirror of
https://github.com/Source2ZE/MovementUnlocker.git
synced 2026-09-27 20:57:04 +02:00
Merge branch 'dev' into main
This commit is contained in:
Vauff
commit
3c55be5323
8 changed files with 160 additions and 347 deletions
21
.github/workflows/ci.yml
vendored
21
.github/workflows/ci.yml
vendored
|
|
@ -1,14 +1,6 @@
|
|||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
tags:
|
||||
- '*'
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
|
@ -28,6 +20,7 @@ jobs:
|
|||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: MovementUnlocker
|
||||
submodules: recursive
|
||||
|
||||
- name: Checkout Metamod
|
||||
uses: actions/checkout@v4
|
||||
|
|
@ -59,11 +52,11 @@ jobs:
|
|||
shell: bash
|
||||
run: |
|
||||
mkdir build && cd build
|
||||
python ../configure.py --enable-optimize --symbol-files --sdks cs2
|
||||
python ../configure.py --enable-optimize --symbol-files --sdks cs2 --hl2sdk-manifests hl2sdk-manifests/
|
||||
ambuild
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ runner.os }}
|
||||
path: MovementUnlocker/build/package
|
||||
|
|
@ -76,7 +69,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Download artifacts
|
||||
uses: actions/download-artifact@v3
|
||||
uses: actions/download-artifact@v4
|
||||
|
||||
- name: Package
|
||||
run: |
|
||||
|
|
@ -84,12 +77,12 @@ jobs:
|
|||
ls -Rall
|
||||
if [ -d "./Linux/" ]; then
|
||||
cd ./Linux/
|
||||
tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz addons
|
||||
tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz *
|
||||
cd -
|
||||
fi
|
||||
if [ -d "./Windows/" ]; then
|
||||
cd ./Windows/
|
||||
zip -r ../${{ github.event.repository.name }}-${version}-windows.zip addons
|
||||
zip -r ../${{ github.event.repository.name }}-${version}-windows.zip *
|
||||
cd -
|
||||
fi
|
||||
|
||||
|
|
|
|||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[submodule "hl2sdk-manifests"]
|
||||
path = hl2sdk-manifests
|
||||
url = https://github.com/alliedmodders/hl2sdk-manifests.git
|
||||
409
AMBuildScript
generated
409
AMBuildScript
generated
|
|
@ -1,99 +1,26 @@
|
|||
# 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',
|
||||
]
|
||||
# Edit the functions below for the extra functionality, the return should be
|
||||
# a list of path's to wanted locations
|
||||
def additional_libs(context, binary, sdk):
|
||||
return [
|
||||
# Path should be relative either to hl2sdk folder or to build folder
|
||||
# 'path/to/lib/example.lib',
|
||||
]
|
||||
|
||||
additional_defines = [
|
||||
#'EXAMPLE_DEFINE=2'
|
||||
]
|
||||
def additional_defines(context, binary, sdk):
|
||||
return [
|
||||
# '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 additional_includes(context, binary, sdk):
|
||||
return [
|
||||
# Path should be absolute only!
|
||||
# os.path.join(sdk['path'], 'game', 'server'),
|
||||
# os.path.join(sdk['path'], 'public', 'entity2'),
|
||||
# 'D:/absolute/path/to/include/folder/'
|
||||
]
|
||||
|
||||
def ResolveEnvPath(env, folder):
|
||||
if env in os.environ:
|
||||
|
|
@ -111,14 +38,44 @@ def ResolveEnvPath(env, folder):
|
|||
head, tail = os.path.split(head)
|
||||
return None
|
||||
|
||||
def Normalize(path):
|
||||
return os.path.abspath(os.path.normpath(path))
|
||||
def ResolveMMSRoot():
|
||||
prenormalized_path = None
|
||||
if builder.options.mms_path:
|
||||
prenormalized_path = builder.options.mms_path
|
||||
else:
|
||||
prenormalized_path = ResolveEnvPath('MMSOURCE20', 'mmsource-2.0')
|
||||
if not prenormalized_path:
|
||||
prenormalized_path = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
|
||||
if not prenormalized_path:
|
||||
prenormalized_path = ResolveEnvPath('MMSOURCE111', 'mmsource-1.11')
|
||||
if not prenormalized_path:
|
||||
prenormalized_path = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
|
||||
if not prenormalized_path:
|
||||
prenormalized_path = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source')
|
||||
if not prenormalized_path:
|
||||
prenormalized_path = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central')
|
||||
if not prenormalized_path or not os.path.isdir(prenormalized_path):
|
||||
raise Exception('Could not find a source copy of Metamod:Source')
|
||||
|
||||
return os.path.abspath(os.path.normpath(prenormalized_path))
|
||||
|
||||
mms_root = ResolveMMSRoot()
|
||||
|
||||
if not builder.options.hl2sdk_manifests:
|
||||
raise Exception('Could not find a source copy of HL2SDK manifests')
|
||||
hl2sdk_manifests = builder.options.hl2sdk_manifests
|
||||
|
||||
SdkHelpers = builder.Eval(os.path.join(hl2sdk_manifests, 'SdkHelpers.ambuild'), {
|
||||
'Project': 'metamod'
|
||||
})
|
||||
|
||||
class MMSPluginConfig(object):
|
||||
def __init__(self):
|
||||
self.sdk_manifests = []
|
||||
self.sdks = {}
|
||||
self.sdk_targets = []
|
||||
self.binaries = []
|
||||
self.mms_root = None
|
||||
self.mms_root = mms_root
|
||||
self.all_targets = []
|
||||
self.target_archs = set()
|
||||
|
||||
|
|
@ -135,8 +92,7 @@ class MMSPluginConfig(object):
|
|||
if builder.options.targets:
|
||||
target_archs = builder.options.targets.split(',')
|
||||
else:
|
||||
target_archs = ['x86']
|
||||
target_archs.append('x86_64')
|
||||
target_archs = ['x86_64']
|
||||
|
||||
for arch in target_archs:
|
||||
try:
|
||||
|
|
@ -153,59 +109,25 @@ class MMSPluginConfig(object):
|
|||
if not self.all_targets:
|
||||
raise Exception('No suitable C/C++ compiler was found.')
|
||||
|
||||
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 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 = []
|
||||
sdk_list = [s for s in builder.options.sdks.split(',') if s]
|
||||
SdkHelpers.find_sdk_path = self.findSdkPath
|
||||
SdkHelpers.findSdks(builder, self.all_targets, 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
|
||||
self.sdks = SdkHelpers.sdks
|
||||
self.sdk_manifests = SdkHelpers.sdk_manifests
|
||||
self.sdk_targets = SdkHelpers.sdk_targets
|
||||
|
||||
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('MMSOURCE20', 'mmsource-2.0')
|
||||
if not self.mms_root:
|
||||
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:
|
||||
|
|
@ -236,10 +158,7 @@ class MMSPluginConfig(object):
|
|||
'-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']
|
||||
cxx.cxxflags += ['-std=c++17']
|
||||
if (cxx.version >= 'gcc-4.0') or cxx.family == 'clang':
|
||||
cxx.cflags += ['-fvisibility=hidden']
|
||||
cxx.cxxflags += ['-fvisibility-inlines-hidden']
|
||||
|
|
@ -249,6 +168,7 @@ class MMSPluginConfig(object):
|
|||
'-fno-threadsafe-statics',
|
||||
'-Wno-non-virtual-dtor',
|
||||
'-Wno-overloaded-virtual',
|
||||
'-Wno-register',
|
||||
]
|
||||
if (cxx.version >= 'gcc-4.7' or cxx.family == 'clang'):
|
||||
cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
|
||||
|
|
@ -256,17 +176,17 @@ class MMSPluginConfig(object):
|
|||
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':
|
||||
if cxx.version >= 'clang-3.9':
|
||||
cxx.cxxflags += ['-Wno-expansion-to-defined']
|
||||
if cxx.version >= 'clang-3.6' or cxx.version >= 'apple-clang-7.0':
|
||||
if cxx.version >= 'clang-3.6':
|
||||
cxx.cxxflags += ['-Wno-inconsistent-missing-override']
|
||||
if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
|
||||
if 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':
|
||||
if cxx.version >= 'clang-10.0':
|
||||
cxx.cflags += [
|
||||
'-Wno-implicit-int-float-conversion',
|
||||
'-Wno-tautological-overlap-compare',
|
||||
|
|
@ -286,6 +206,7 @@ class MMSPluginConfig(object):
|
|||
cxx.cflags += [
|
||||
'/W3',
|
||||
'/Zi',
|
||||
'/std:c++17',
|
||||
]
|
||||
cxx.cxxflags += ['/TP']
|
||||
|
||||
|
|
@ -331,28 +252,12 @@ class MMSPluginConfig(object):
|
|||
|
||||
# Platform-specifics
|
||||
if cxx.target.platform == 'linux':
|
||||
cxx.defines += ['_LINUX', 'POSIX', '_FILE_OFFSET_BITS=64']
|
||||
cxx.defines += ['LINUX', '_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++',
|
||||
]
|
||||
cxx.linkflags += ['-static-libstdc++']
|
||||
elif cxx.target.platform == 'windows':
|
||||
cxx.defines += ['WIN32', '_WINDOWS']
|
||||
|
||||
|
|
@ -362,157 +267,37 @@ class MMSPluginConfig(object):
|
|||
# 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
|
||||
mms_core_path = os.path.join(self.mms_root, 'core')
|
||||
cxx = 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)
|
||||
cxx.cxxincludes += [
|
||||
os.path.join(context.currentSourcePath),
|
||||
os.path.join(mms_core_path),
|
||||
os.path.join(mms_core_path, 'sourcehook'),
|
||||
]
|
||||
|
||||
for library in dynamic_libs:
|
||||
source_path = os.path.join(lib_folder, library)
|
||||
output_path = os.path.join(binary.localFolder, library)
|
||||
defines = []
|
||||
for other_sdk in self.sdk_manifests:
|
||||
cxx.defines += ['SE_{}={}'.format(other_sdk['define'], other_sdk['code'])]
|
||||
|
||||
context.AddFolder(binary.localFolder)
|
||||
output = context.AddSymlink(source_path, output_path)
|
||||
if sdk['source2']:
|
||||
cxx.defines += ['META_IS_SOURCE2']
|
||||
binary.sources += [
|
||||
os.path.join(sdk['path'], 'public', 'tier0', 'memoverride.cpp'),
|
||||
os.path.join(sdk['path'], 'tier1', 'convar.cpp'),
|
||||
]
|
||||
|
||||
binary.compiler.weaklinkdeps += [output]
|
||||
binary.compiler.linkflags[0:0] = [library]
|
||||
SdkHelpers.configureCxx(context, binary, sdk)
|
||||
|
||||
cxx.linkflags += additional_libs(context, binary, sdk)
|
||||
cxx.defines += additional_defines(context, binary, sdk)
|
||||
cxx.cxxincludes += additional_includes(context, binary, sdk)
|
||||
|
||||
return binary
|
||||
|
||||
|
|
|
|||
33
AMBuilder
generated
33
AMBuilder
generated
|
|
@ -6,28 +6,19 @@ import os
|
|||
# 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]
|
||||
for sdk_target in MMSPlugin.sdk_targets:
|
||||
sdk = sdk_target.sdk
|
||||
cxx = sdk_target.cxx
|
||||
|
||||
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
|
||||
continue
|
||||
binary = MMSPlugin.HL2Library(builder, cxx, MMSPlugin.plugin_name, sdk)
|
||||
|
||||
binary = MMSPlugin.HL2Library(builder, cxx, MMSPlugin.plugin_name, sdk)
|
||||
binary.sources += [
|
||||
'MovementUnlocker.cpp',
|
||||
]
|
||||
|
||||
binary.sources += [
|
||||
'MovementUnlocker.cpp',
|
||||
]
|
||||
binary.custom = [builder.tools.Protoc(protoc = sdk_target.protoc, sources = [
|
||||
os.path.join(sdk['path'], 'common', 'network_connection.proto'),
|
||||
])]
|
||||
|
||||
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
|
||||
nodes = builder.Add(binary)
|
||||
MMSPlugin.binaries += [nodes]
|
||||
|
|
|
|||
|
|
@ -1,3 +1,22 @@
|
|||
/**
|
||||
* =============================================================================
|
||||
* Movement Unlocker
|
||||
* Copyright (C) 2024 Source2ZE
|
||||
* =============================================================================
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "MovementUnlocker.h"
|
||||
#include <sh_memory.h>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,22 @@
|
|||
/**
|
||||
* =============================================================================
|
||||
* Movement Unlocker
|
||||
* Copyright (C) 2024 Source2ZE
|
||||
* =============================================================================
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#ifndef _INCLUDE_MOVEMENT_UNLOCKER_H_
|
||||
#define _INCLUDE_MOVEMENT_UNLOCKER_H_
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ parser.options.add_argument('-a', '--plugin-alias', type=str, dest='plugin_alias
|
|||
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('--hl2sdk-manifests', type=str, dest='hl2sdk_manifests', default=None,
|
||||
help='HL2SDK manifests source tree folder')
|
||||
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',
|
||||
|
|
|
|||
1
hl2sdk-manifests
Submodule
1
hl2sdk-manifests
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 22f699a941093d9d68c1f647c7c545ec346d0ee3
|
||||
Loading…
Add table
Add a link
Reference in a new issue