mirror of
https://github.com/srcdslab/sm-ext-cssfixes.git
synced 2025-12-06 18:18:24 +00:00
Compare commits
2 Commits
ee41205361
...
d5c807a7bf
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d5c807a7bf | ||
|
|
d6f595ea6f |
6
.github/dependabot.yml
vendored
Normal file
6
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "github-actions"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "weekly"
|
||||||
125
.github/workflows/ci.yml
vendored
125
.github/workflows/ci.yml
vendored
@ -1,112 +1,19 @@
|
|||||||
name: CI
|
name: Build AlliedModders Extension
|
||||||
|
|
||||||
on: [push, pull_request, workflow_dispatch]
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
- main
|
||||||
|
tags:
|
||||||
|
- "*"
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
- main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build-release-extension:
|
||||||
name: Build
|
uses: srcdslab/ci-workflows/.github/workflows/shared_build_release_am_extension.yml@v1
|
||||||
runs-on: ${{ matrix.os }}
|
with:
|
||||||
strategy:
|
sdks: "css"
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-20.04]
|
|
||||||
sourcemod-version: [1.11-dev]
|
|
||||||
include:
|
|
||||||
- os: ubuntu-20.04
|
|
||||||
target-archs: x86,x86_64
|
|
||||||
sdks: css
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Install Linux packages
|
|
||||||
if: runner.os == 'Linux'
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -yq --no-install-recommends g++-multilib
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v2
|
|
||||||
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
path: extension
|
|
||||||
|
|
||||||
- name: Checkout SourceMod
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
repository: alliedmodders/sourcemod
|
|
||||||
ref: ${{ matrix.sourcemod-version }}
|
|
||||||
path: sourcemod
|
|
||||||
submodules: recursive
|
|
||||||
|
|
||||||
- name: Checkout AMBuild
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
repository: alliedmodders/ambuild
|
|
||||||
path: ambuild
|
|
||||||
|
|
||||||
- name: Checkout sm-ext-common
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
repository: srcdslab/sm-ext-common
|
|
||||||
path: sourcemod/extensions/sm-ext-common
|
|
||||||
|
|
||||||
- name: Install sourcemod dependencies
|
|
||||||
run: |
|
|
||||||
bash sourcemod/tools/checkout-deps.sh -m -s ${{ matrix.sdks }}
|
|
||||||
|
|
||||||
- name: Install AMBuild
|
|
||||||
uses: BSFishy/pip-action@v1
|
|
||||||
with:
|
|
||||||
packages: ./ambuild
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
working-directory: extension
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BREAKPAD_SYMBOL_SERVER: ${{ secrets.BREAKPAD_SYMBOL_SERVER }}
|
|
||||||
run: |
|
|
||||||
mkdir build && cd build
|
|
||||||
python ../configure.py --enable-optimize --targets=${{ matrix.target-archs }} --sdks=${{ matrix.sdks }}
|
|
||||||
ambuild
|
|
||||||
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: ${{ runner.os }}
|
|
||||||
path: extension/build/package
|
|
||||||
|
|
||||||
|
|
||||||
release:
|
|
||||||
name: Release
|
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
|
||||||
needs: build
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Download artifacts
|
|
||||||
uses: actions/download-artifact@v2
|
|
||||||
|
|
||||||
- name: Package
|
|
||||||
run: |
|
|
||||||
version=`echo $GITHUB_REF | sed "s/refs\/tags\///"`
|
|
||||||
if [ -d "./Linux/" ]; then
|
|
||||||
cd ./Linux/
|
|
||||||
tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz -T <(\ls -1)
|
|
||||||
fi
|
|
||||||
if [ -d "./macOS/" ]; then
|
|
||||||
cd ./macOS/
|
|
||||||
tar -czf ../${{ github.event.repository.name }}-${version}-mac.tar.gz -T <(\ls -1)
|
|
||||||
fi
|
|
||||||
if [ -d "./Windows/" ]; then
|
|
||||||
cd ./Windows/
|
|
||||||
tar -czf ../${{ github.event.repository.name }}-${version}-windows.tar.gz -T <(\ls -1)
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Release
|
|
||||||
uses: svenstaro/upload-release-action@v2
|
|
||||||
with:
|
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
file: '*.tar.gz'
|
|
||||||
tag: ${{ github.ref }}
|
|
||||||
file_glob: true
|
|
||||||
|
|||||||
7
.gitignore
vendored
Normal file
7
.gitignore
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
build
|
||||||
|
Containerfile
|
||||||
|
.venv
|
||||||
|
safetyhook
|
||||||
|
ambuild
|
||||||
|
*.env
|
||||||
|
*.ps1
|
||||||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[submodule "sm-ext-common"]
|
||||||
|
path = sm-ext-common
|
||||||
|
url = https://github.com/srcdslab/sm-ext-common.git
|
||||||
643
AMBuildScript
643
AMBuildScript
@ -1,643 +0,0 @@
|
|||||||
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
|
|
||||||
import os, sys
|
|
||||||
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']
|
|
||||||
|
|
||||||
PossibleSDKs = {
|
|
||||||
'css': SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'),
|
|
||||||
}
|
|
||||||
|
|
||||||
def ResolveEnvPath(env, folder):
|
|
||||||
if env in os.environ:
|
|
||||||
path = os.environ[env]
|
|
||||||
if os.path.isdir(path):
|
|
||||||
return path
|
|
||||||
return None
|
|
||||||
|
|
||||||
head = os.getcwd()
|
|
||||||
oldhead = None
|
|
||||||
while head != None and head != oldhead:
|
|
||||||
path = os.path.join(head, folder)
|
|
||||||
if os.path.isdir(path):
|
|
||||||
return path
|
|
||||||
oldhead = head
|
|
||||||
head, tail = os.path.split(head)
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def Normalize(path):
|
|
||||||
return os.path.abspath(os.path.normpath(path))
|
|
||||||
|
|
||||||
def SetArchFlags(compiler):
|
|
||||||
if compiler.behavior == 'gcc':
|
|
||||||
if compiler.target.arch == 'x86_64':
|
|
||||||
compiler.cflags += ['-fPIC']
|
|
||||||
elif compiler.like('msvc'):
|
|
||||||
if compiler.target.arch == 'x86_64':
|
|
||||||
compiler.defines += ['WIN64']
|
|
||||||
|
|
||||||
class ExtensionConfig(object):
|
|
||||||
def __init__(self):
|
|
||||||
self.sdks = {}
|
|
||||||
self.binaries = []
|
|
||||||
self.spvm = []
|
|
||||||
self.extensions = []
|
|
||||||
self.generated_headers = None
|
|
||||||
self.sm_root = None
|
|
||||||
self.mms_root = None
|
|
||||||
self.mysql_root = {}
|
|
||||||
self.spcomp = None
|
|
||||||
self.spcomp_bins = None
|
|
||||||
self.smx_files = {}
|
|
||||||
self.versionlib = None
|
|
||||||
self.all_targets = []
|
|
||||||
self.target_archs = set()
|
|
||||||
|
|
||||||
|
|
||||||
if builder.options.targets:
|
|
||||||
target_archs = builder.options.targets.split(',')
|
|
||||||
else:
|
|
||||||
target_archs = ['x86']
|
|
||||||
if builder.backend != 'amb2':
|
|
||||||
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.')
|
|
||||||
|
|
||||||
@property
|
|
||||||
def tag(self):
|
|
||||||
if builder.options.debug == '1':
|
|
||||||
return 'Debug'
|
|
||||||
return 'Release'
|
|
||||||
|
|
||||||
def detectProductVersion(self):
|
|
||||||
builder.AddConfigureFile('product.version')
|
|
||||||
|
|
||||||
# For OS X dylib versioning
|
|
||||||
import re
|
|
||||||
with open(os.path.join(builder.sourcePath, 'product.version'), 'r') as fp:
|
|
||||||
productContents = fp.read()
|
|
||||||
m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents)
|
|
||||||
if m == None:
|
|
||||||
self.productVersion = '1.0.0'
|
|
||||||
else:
|
|
||||||
major, minor, release = m.groups()
|
|
||||||
self.productVersion = '{0}.{1}.{2}'.format(major, minor, release)
|
|
||||||
|
|
||||||
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'
|
|
||||||
|
|
||||||
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 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')
|
|
||||||
|
|
||||||
if builder.options.sm_path:
|
|
||||||
self.sm_root = builder.options.sm_path
|
|
||||||
else:
|
|
||||||
self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.10')
|
|
||||||
if not self.sm_root:
|
|
||||||
self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod-source')
|
|
||||||
if not self.sm_root:
|
|
||||||
self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod-central')
|
|
||||||
if not self.sm_root:
|
|
||||||
self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod')
|
|
||||||
|
|
||||||
if not self.sm_root or not os.path.isdir(self.sm_root):
|
|
||||||
raise Exception('Could not find a source copy of Sourcemod')
|
|
||||||
self.sm_root = Normalize(self.sm_root)
|
|
||||||
|
|
||||||
if builder.options.mms_path:
|
|
||||||
self.mms_root = builder.options.mms_path
|
|
||||||
else:
|
|
||||||
self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
|
|
||||||
if not self.mms_root:
|
|
||||||
self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source')
|
|
||||||
if not self.mms_root:
|
|
||||||
self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central')
|
|
||||||
if not self.mms_root:
|
|
||||||
self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod')
|
|
||||||
|
|
||||||
if not self.mms_root or not os.path.isdir(self.mms_root):
|
|
||||||
raise Exception('Could not find a source copy of Metamod:Source')
|
|
||||||
self.mms_root = Normalize(self.mms_root)
|
|
||||||
|
|
||||||
def configure(self):
|
|
||||||
if not set(self.target_archs).issubset(['x86', 'x86_64']):
|
|
||||||
raise Exception('Unknown target architecture: {0}'.format(self.target_archs))
|
|
||||||
|
|
||||||
for cxx in self.all_targets:
|
|
||||||
self.configure_cxx(cxx)
|
|
||||||
|
|
||||||
def configure_cxx(self, cxx):
|
|
||||||
if cxx.family == 'msvc':
|
|
||||||
if cxx.version < 1900:
|
|
||||||
raise Exception('Only MSVC 2015 and later are supported, c++14 support is required.')
|
|
||||||
if cxx.family == 'gcc':
|
|
||||||
if cxx.version < 'gcc-4.9':
|
|
||||||
raise Exception('Only GCC versions 4.9 or greater are supported, c++14 support is required.')
|
|
||||||
if cxx.family == 'clang':
|
|
||||||
if cxx.version < 'clang-3.4':
|
|
||||||
raise Exception('Only clang versions 3.4 or greater are supported, c++14 support is required.')
|
|
||||||
|
|
||||||
if cxx.like('gcc'):
|
|
||||||
self.configure_gcc(cxx)
|
|
||||||
elif cxx.family == 'msvc':
|
|
||||||
self.configure_msvc(cxx)
|
|
||||||
|
|
||||||
# Optimizaiton
|
|
||||||
if builder.options.opt == '1':
|
|
||||||
cxx.defines += ['NDEBUG']
|
|
||||||
|
|
||||||
# Debugging
|
|
||||||
if builder.options.debug == '1':
|
|
||||||
cxx.defines += ['DEBUG', '_DEBUG']
|
|
||||||
|
|
||||||
# Platform-specifics
|
|
||||||
if cxx.target.platform == 'linux':
|
|
||||||
self.configure_linux(cxx)
|
|
||||||
elif cxx.target.platform == 'mac':
|
|
||||||
self.configure_mac(cxx)
|
|
||||||
elif cxx.target.platform == 'windows':
|
|
||||||
self.configure_windows(cxx)
|
|
||||||
|
|
||||||
# Finish up.
|
|
||||||
cxx.includes += [
|
|
||||||
os.path.join(self.sm_root, 'public'),
|
|
||||||
]
|
|
||||||
|
|
||||||
def configure_gcc(self, cxx):
|
|
||||||
cxx.defines += [
|
|
||||||
'stricmp=strcasecmp',
|
|
||||||
'_stricmp=strcasecmp',
|
|
||||||
'_snprintf=snprintf',
|
|
||||||
'_vsnprintf=vsnprintf',
|
|
||||||
'HAVE_STDINT_H',
|
|
||||||
'GNUC',
|
|
||||||
]
|
|
||||||
cxx.cflags += [
|
|
||||||
'-pipe',
|
|
||||||
'-fno-strict-aliasing',
|
|
||||||
'-Wall',
|
|
||||||
'-Werror',
|
|
||||||
'-Wno-unused',
|
|
||||||
'-Wno-switch',
|
|
||||||
'-Wno-array-bounds',
|
|
||||||
'-msse',
|
|
||||||
'-fvisibility=hidden',
|
|
||||||
]
|
|
||||||
|
|
||||||
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 += [
|
|
||||||
'-fno-threadsafe-statics',
|
|
||||||
'-Wno-non-virtual-dtor',
|
|
||||||
'-Wno-overloaded-virtual',
|
|
||||||
'-fvisibility-inlines-hidden',
|
|
||||||
]
|
|
||||||
|
|
||||||
have_gcc = cxx.family == 'gcc'
|
|
||||||
have_clang = cxx.family == 'clang'
|
|
||||||
if cxx.version >= 'clang-3.9' or cxx.version == 'clang-3.4' or cxx.version > 'apple-clang-6.0':
|
|
||||||
cxx.cxxflags += ['-Wno-expansion-to-defined']
|
|
||||||
if cxx.version == 'clang-3.9' or cxx.version == 'apple-clang-8.0':
|
|
||||||
cxx.cflags += ['-Wno-varargs']
|
|
||||||
if cxx.version >= 'clang-3.4' or cxx.version >= 'apple-clang-7.0':
|
|
||||||
cxx.cxxflags += ['-Wno-inconsistent-missing-override']
|
|
||||||
if cxx.version >= 'clang-2.9' or cxx.version >= 'apple-clang-3.0':
|
|
||||||
cxx.cxxflags += ['-Wno-null-dereference']
|
|
||||||
if have_clang or (cxx.version >= 'gcc-4.6'):
|
|
||||||
cxx.cflags += ['-Wno-narrowing']
|
|
||||||
if have_clang or (cxx.version >= 'gcc-4.7'):
|
|
||||||
cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
|
|
||||||
if cxx.version >= 'gcc-4.8':
|
|
||||||
cxx.cflags += ['-Wno-unused-result']
|
|
||||||
if cxx.version >= 'gcc-9.0':
|
|
||||||
cxx.cxxflags += ['-Wno-class-memaccess', '-Wno-packed-not-aligned']
|
|
||||||
if have_clang:
|
|
||||||
cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
|
|
||||||
if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
|
|
||||||
cxx.cxxflags += ['-Wno-deprecated-register']
|
|
||||||
else:
|
|
||||||
cxx.cxxflags += ['-Wno-deprecated']
|
|
||||||
cxx.cflags += ['-Wno-sometimes-uninitialized']
|
|
||||||
|
|
||||||
# Work around SDK warnings.
|
|
||||||
if cxx.version >= 'clang-10.0':
|
|
||||||
cxx.cflags += [
|
|
||||||
'-Wno-implicit-int-float-conversion',
|
|
||||||
'-Wno-tautological-overlap-compare',
|
|
||||||
]
|
|
||||||
|
|
||||||
if have_gcc:
|
|
||||||
cxx.cflags += ['-mfpmath=sse']
|
|
||||||
cxx.cflags += ['-Wno-maybe-uninitialized']
|
|
||||||
|
|
||||||
if builder.options.opt == '1':
|
|
||||||
cxx.cflags += [
|
|
||||||
'-O3',
|
|
||||||
'-fexperimental-new-pass-manager',
|
|
||||||
'-mllvm',
|
|
||||||
'-inline-threshold=1000',
|
|
||||||
'-mllvm',
|
|
||||||
'-vectorize-loops',
|
|
||||||
'-ftree-vectorize',
|
|
||||||
]
|
|
||||||
|
|
||||||
# Don't omit the frame pointer.
|
|
||||||
cxx.cflags += ['-fno-omit-frame-pointer']
|
|
||||||
|
|
||||||
def configure_msvc(self, cxx):
|
|
||||||
if builder.options.debug == '1':
|
|
||||||
cxx.cflags += ['/MTd']
|
|
||||||
cxx.linkflags += ['/NODEFAULTLIB:libcmt']
|
|
||||||
else:
|
|
||||||
cxx.cflags += ['/MT']
|
|
||||||
cxx.defines += [
|
|
||||||
'_CRT_SECURE_NO_DEPRECATE',
|
|
||||||
'_CRT_SECURE_NO_WARNINGS',
|
|
||||||
'_CRT_NONSTDC_NO_DEPRECATE',
|
|
||||||
'_ITERATOR_DEBUG_LEVEL=0',
|
|
||||||
]
|
|
||||||
cxx.cflags += [
|
|
||||||
'/W3',
|
|
||||||
]
|
|
||||||
cxx.cxxflags += [
|
|
||||||
'/EHsc',
|
|
||||||
'/GR-',
|
|
||||||
'/TP',
|
|
||||||
]
|
|
||||||
cxx.linkflags += [
|
|
||||||
'kernel32.lib',
|
|
||||||
'user32.lib',
|
|
||||||
'gdi32.lib',
|
|
||||||
'winspool.lib',
|
|
||||||
'comdlg32.lib',
|
|
||||||
'advapi32.lib',
|
|
||||||
'shell32.lib',
|
|
||||||
'ole32.lib',
|
|
||||||
'oleaut32.lib',
|
|
||||||
'uuid.lib',
|
|
||||||
'odbc32.lib',
|
|
||||||
'odbccp32.lib',
|
|
||||||
]
|
|
||||||
|
|
||||||
if builder.options.opt == '1':
|
|
||||||
cxx.cflags += ['/Ox', '/Zo']
|
|
||||||
cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
|
|
||||||
|
|
||||||
if builder.options.debug == '1':
|
|
||||||
cxx.cflags += ['/Od', '/RTC1']
|
|
||||||
|
|
||||||
# This needs to be after our optimization flags which could otherwise disable it.
|
|
||||||
# Don't omit the frame pointer.
|
|
||||||
cxx.cflags += ['/Oy-']
|
|
||||||
|
|
||||||
def configure_linux(self, cxx):
|
|
||||||
cxx.defines += ['_LINUX', 'POSIX', '_FILE_OFFSET_BITS=64']
|
|
||||||
cxx.linkflags += ['-lm']
|
|
||||||
if cxx.family == 'gcc':
|
|
||||||
cxx.linkflags += ['-static-libgcc']
|
|
||||||
elif cxx.family == 'clang':
|
|
||||||
cxx.linkflags += ['-lgcc_eh']
|
|
||||||
cxx.linkflags += ['-static-libstdc++']
|
|
||||||
|
|
||||||
def configure_mac(self, cxx):
|
|
||||||
cxx.defines += ['OSX', '_OSX', 'POSIX', 'KE_ABSOLUTELY_NO_STL']
|
|
||||||
cxx.cflags += ['-mmacosx-version-min=10.7']
|
|
||||||
cxx.linkflags += [
|
|
||||||
'-mmacosx-version-min=10.7',
|
|
||||||
'-stdlib=libc++',
|
|
||||||
'-lc++',
|
|
||||||
]
|
|
||||||
cxx.cxxflags += ['-stdlib=libc++']
|
|
||||||
|
|
||||||
def configure_windows(self, cxx):
|
|
||||||
cxx.defines += ['WIN32', '_WINDOWS']
|
|
||||||
|
|
||||||
def add_libamtl(self):
|
|
||||||
# Add libamtl.
|
|
||||||
self.libamtl = {}
|
|
||||||
for cxx in self.all_targets:
|
|
||||||
def get_configure_fn(cxx):
|
|
||||||
return lambda builder, name: self.StaticLibrary(builder, cxx, name)
|
|
||||||
extra_vars = {'Configure': get_configure_fn(cxx)}
|
|
||||||
libamtl = builder.Build('public/amtl/amtl/AMBuilder', extra_vars)
|
|
||||||
self.libamtl[cxx.target.arch] = libamtl.binary
|
|
||||||
|
|
||||||
def AddVersioning(self, binary):
|
|
||||||
if binary.compiler.target.platform == 'windows':
|
|
||||||
binary.sources += ['version.rc']
|
|
||||||
binary.compiler.rcdefines += [
|
|
||||||
'BINARY_NAME="{0}"'.format(binary.outputFile),
|
|
||||||
'RC_COMPILE',
|
|
||||||
]
|
|
||||||
elif binary.compiler.target.platform == 'mac':
|
|
||||||
if binary.type == 'library':
|
|
||||||
binary.compiler.postlink += [
|
|
||||||
'-compatibility_version', '1.0.0',
|
|
||||||
'-current_version', self.productVersion
|
|
||||||
]
|
|
||||||
return binary
|
|
||||||
|
|
||||||
def LibraryBuilder(self, compiler, name):
|
|
||||||
binary = compiler.Library(name)
|
|
||||||
self.AddVersioning(binary)
|
|
||||||
if binary.compiler.like('msvc'):
|
|
||||||
binary.compiler.linkflags += ['/SUBSYSTEM:WINDOWS']
|
|
||||||
return binary
|
|
||||||
|
|
||||||
def ProgramBuilder(self, compiler, name):
|
|
||||||
binary = compiler.Program(name)
|
|
||||||
self.AddVersioning(binary)
|
|
||||||
if '-static-libgcc' in binary.compiler.linkflags:
|
|
||||||
binary.compiler.linkflags.remove('-static-libgcc')
|
|
||||||
if '-lgcc_eh' in binary.compiler.linkflags:
|
|
||||||
binary.compiler.linkflags.remove('-lgcc_eh')
|
|
||||||
if binary.compiler.like('gcc'):
|
|
||||||
binary.compiler.linkflags += ['-lstdc++', '-lpthread']
|
|
||||||
if binary.compiler.like('msvc'):
|
|
||||||
binary.compiler.linkflags += ['/SUBSYSTEM:CONSOLE']
|
|
||||||
return binary
|
|
||||||
|
|
||||||
def StaticLibraryBuilder(self, compiler, name):
|
|
||||||
return compiler.StaticLibrary(name)
|
|
||||||
|
|
||||||
def Library(self, context, compiler, name):
|
|
||||||
compiler = compiler.clone()
|
|
||||||
SetArchFlags(compiler)
|
|
||||||
return self.LibraryBuilder(compiler, name)
|
|
||||||
|
|
||||||
def Program(self, context, compiler, name):
|
|
||||||
compiler = compiler.clone()
|
|
||||||
SetArchFlags(compiler)
|
|
||||||
return self.ProgramBuilder(compiler, name)
|
|
||||||
|
|
||||||
def StaticLibrary(self, context, compiler, name):
|
|
||||||
compiler = compiler.clone()
|
|
||||||
SetArchFlags(compiler)
|
|
||||||
return self.StaticLibraryBuilder(compiler, name)
|
|
||||||
|
|
||||||
def ConfigureForExtension(self, context, compiler):
|
|
||||||
compiler.cxxincludes += [
|
|
||||||
os.path.join(context.currentSourcePath),
|
|
||||||
os.path.join(context.currentSourcePath, 'sdk'),
|
|
||||||
os.path.join(self.sm_root, 'public'),
|
|
||||||
os.path.join(self.sm_root, 'public', 'extensions'),
|
|
||||||
os.path.join(self.sm_root, 'sourcepawn', 'include'),
|
|
||||||
os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
|
|
||||||
os.path.join(self.sm_root, 'public', 'amtl'),
|
|
||||||
os.path.join(self.sm_root, 'extensions', 'sm-ext-common', 'include'),
|
|
||||||
]
|
|
||||||
return compiler
|
|
||||||
|
|
||||||
def ExtLibrary(self, context, compiler, name):
|
|
||||||
binary = self.Library(context, compiler, name)
|
|
||||||
SetArchFlags(compiler)
|
|
||||||
self.ConfigureForExtension(context, binary.compiler)
|
|
||||||
return binary
|
|
||||||
|
|
||||||
def ConfigureForHL2(self, context, binary, sdk):
|
|
||||||
compiler = binary.compiler
|
|
||||||
SetArchFlags(compiler)
|
|
||||||
|
|
||||||
compiler.cxxincludes += [
|
|
||||||
os.path.join(self.mms_root, 'core'),
|
|
||||||
os.path.join(self.mms_root, 'core', 'sourcehook'),
|
|
||||||
]
|
|
||||||
|
|
||||||
defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs]
|
|
||||||
compiler.defines += defines
|
|
||||||
|
|
||||||
paths = [
|
|
||||||
['public'],
|
|
||||||
['public', 'engine'],
|
|
||||||
['public', 'mathlib'],
|
|
||||||
['public', 'vstdlib'],
|
|
||||||
['public', 'tier0'],
|
|
||||||
['public', 'tier1']
|
|
||||||
]
|
|
||||||
if 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'] 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', 'csgo']:
|
|
||||||
compiler.defines += ['NETWORK_VARS_ENABLED']
|
|
||||||
|
|
||||||
if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2']:
|
|
||||||
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.defines += ['_GLIBCXX_USE_CXX11_ABI=0']
|
|
||||||
|
|
||||||
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']:
|
|
||||||
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'] 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', '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', 'blade']:
|
|
||||||
dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so']
|
|
||||||
elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo']:
|
|
||||||
dynamic_libs = ['libtier0.so', 'libvstdlib.so']
|
|
||||||
else:
|
|
||||||
dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
|
|
||||||
elif 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', '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]
|
|
||||||
|
|
||||||
return binary
|
|
||||||
|
|
||||||
def HL2Library(self, context, compiler, name, sdk):
|
|
||||||
binary = self.Library(context, compiler, name)
|
|
||||||
self.ConfigureForExtension(context, binary.compiler)
|
|
||||||
return self.ConfigureForHL2(context, binary, sdk)
|
|
||||||
|
|
||||||
def HL2Project(self, context, compiler, name):
|
|
||||||
project = context.LibraryProject(name)
|
|
||||||
self.ConfigureForExtension(context, compiler)
|
|
||||||
return project
|
|
||||||
|
|
||||||
def HL2Config(self, project, context, compiler, name, sdk):
|
|
||||||
binary = project.Configure(compiler, name,
|
|
||||||
'{0} - {1} {2}'.format(self.tag, sdk.name, compiler.target.arch))
|
|
||||||
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))
|
|
||||||
self.AddVersioning(binary)
|
|
||||||
self.ConfigureForHL2(context, binary, sdk)
|
|
||||||
self.ConfigureForExtension(context, binary.compiler)
|
|
||||||
return binary
|
|
||||||
|
|
||||||
if getattr(builder, 'target', None) is not None:
|
|
||||||
sys.stderr.write("Your output folder was configured for AMBuild 2.1, and SourceMod is now\n")
|
|
||||||
sys.stderr.write("configured to use AMBuild 2.2. Please remove your output folder and\n")
|
|
||||||
sys.stderr.write("reconfigure to continue.\n")
|
|
||||||
os._exit(1)
|
|
||||||
|
|
||||||
SM = ExtensionConfig()
|
|
||||||
SM.detectSDKs()
|
|
||||||
SM.configure()
|
|
||||||
|
|
||||||
# This will clone the list and each cxx object as we recurse, preventing child
|
|
||||||
# scripts from messing up global state.
|
|
||||||
builder.targets = builder.CloneableList(SM.all_targets)
|
|
||||||
|
|
||||||
if builder.backend == 'amb2':
|
|
||||||
BuildScripts = [
|
|
||||||
'AMBuilder',
|
|
||||||
'PackageScript',
|
|
||||||
]
|
|
||||||
|
|
||||||
builder.Build(BuildScripts, { 'SM': SM})
|
|
||||||
44
AMBuilder
44
AMBuilder
@ -1,44 +0,0 @@
|
|||||||
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
|
|
||||||
import os
|
|
||||||
|
|
||||||
projectName = 'CSSFixes'
|
|
||||||
|
|
||||||
for cxx in builder.targets:
|
|
||||||
for sdk_name in SM.sdks:
|
|
||||||
sdk = SM.sdks[sdk_name]
|
|
||||||
|
|
||||||
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
|
|
||||||
continue
|
|
||||||
|
|
||||||
binary = SM.HL2Library(builder, cxx, projectName + '.ext.' + sdk.ext, sdk)
|
|
||||||
|
|
||||||
binary.compiler.defines += [
|
|
||||||
'HAVE_STRING_H',
|
|
||||||
]
|
|
||||||
|
|
||||||
if cxx.target.platform == 'linux':
|
|
||||||
cxx.postlink += ['-lpthread', '-lrt']
|
|
||||||
elif cxx.target.platform == 'mac':
|
|
||||||
cxx.cflags += ['-Wno-deprecated-declarations']
|
|
||||||
cxx.postlink += ['-framework', 'CoreServices']
|
|
||||||
|
|
||||||
if cxx.family == 'gcc' or cxx.family == 'clang':
|
|
||||||
cxx.cxxflags += ['-fno-rtti']
|
|
||||||
elif cxx.family == 'msvc':
|
|
||||||
cxx.cxxflags += ['/GR-']
|
|
||||||
|
|
||||||
binary.sources += [
|
|
||||||
'extension.cpp',
|
|
||||||
os.path.join(SM.sm_root, 'extensions', 'sm-ext-common', 'mathstubs.c'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'smsdk_ext.cpp'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'CDetour', 'detours.cpp'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'asm', 'asm.c'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'libudis86', 'decode.c'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'libudis86', 'itab.c'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'libudis86', 'syn-att.c'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'libudis86', 'syn-intel.c'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'libudis86', 'syn.c'),
|
|
||||||
os.path.join(SM.sm_root, 'public', 'libudis86', 'udis86.c'),
|
|
||||||
]
|
|
||||||
|
|
||||||
SM.extensions += [builder.Add(binary)]
|
|
||||||
233
Makefile
233
Makefile
@ -1,233 +0,0 @@
|
|||||||
# (C)2004-2010 SourceMod Development Team
|
|
||||||
# Makefile written by David "BAILOPAN" Anderson
|
|
||||||
|
|
||||||
###########################################
|
|
||||||
### EDIT THESE PATHS FOR YOUR OWN SETUP ###
|
|
||||||
###########################################
|
|
||||||
|
|
||||||
SMSDK = ../..
|
|
||||||
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 = ../../../mmsource-1.9
|
|
||||||
|
|
||||||
#####################################
|
|
||||||
### EDIT BELOW FOR OTHER PROJECTS ###
|
|
||||||
#####################################
|
|
||||||
|
|
||||||
PROJECT = sample
|
|
||||||
|
|
||||||
#Uncomment for Metamod: Source enabled extension
|
|
||||||
#USEMETA = true
|
|
||||||
|
|
||||||
OBJECTS = smsdk_ext.cpp extension.cpp
|
|
||||||
|
|
||||||
##############################################
|
|
||||||
### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
|
|
||||||
##############################################
|
|
||||||
|
|
||||||
C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
|
|
||||||
C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
|
|
||||||
C_GCC4_FLAGS = -fvisibility=hidden
|
|
||||||
CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
|
|
||||||
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
|
|
||||||
HL2LIB = $(HL2SDK)/lib/mac
|
|
||||||
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
|
|
||||||
LIB_SUFFIX = .$(LIB_EXT)
|
|
||||||
endif
|
|
||||||
|
|
||||||
INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
|
|
||||||
|
|
||||||
ifeq "$(USEMETA)" "true"
|
|
||||||
LINK_HL2 = $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX)
|
|
||||||
ifeq "$(ENGINE)" "csgo"
|
|
||||||
LINK_HL2 += $(HL2LIB)/interfaces_i486.a
|
|
||||||
endif
|
|
||||||
|
|
||||||
LINK += $(LINK_HL2)
|
|
||||||
|
|
||||||
INCLUDE += -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(METAMOD) \
|
|
||||||
-I$(METAMOD)/sourcehook
|
|
||||||
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
|
|
||||||
endif
|
|
||||||
|
|
||||||
LINK += -m32 -lm -ldl
|
|
||||||
|
|
||||||
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 -Werror \
|
|
||||||
-Wno-overloaded-virtual -Wno-switch -Wno-unused -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
|
|
||||||
CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
|
|
||||||
|
|
||||||
################################################
|
|
||||||
### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
|
|
||||||
################################################
|
|
||||||
|
|
||||||
BINARY = $(PROJECT).ext.$(LIB_EXT)
|
|
||||||
|
|
||||||
ifeq "$(DEBUG)" "true"
|
|
||||||
BIN_DIR = Debug
|
|
||||||
CFLAGS += $(C_DEBUG_FLAGS)
|
|
||||||
else
|
|
||||||
BIN_DIR = Release
|
|
||||||
CFLAGS += $(C_OPT_FLAGS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq "$(USEMETA)" "true"
|
|
||||||
BIN_DIR := $(BIN_DIR).$(ENGINE)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq "$(OS)" "Darwin"
|
|
||||||
CPP = $(CPP_OSX)
|
|
||||||
LIB_EXT = dylib
|
|
||||||
CFLAGS += -DOSX -D_OSX
|
|
||||||
LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
|
|
||||||
else
|
|
||||||
LIB_EXT = so
|
|
||||||
CFLAGS += -D_LINUX
|
|
||||||
LINK += -shared
|
|
||||||
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
|
|
||||||
|
|
||||||
# If not clang
|
|
||||||
ifeq "$(IS_CLANG)" "0"
|
|
||||||
CFLAGS += -mfpmath=sse
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Clang || GCC >= 4
|
|
||||||
ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
|
|
||||||
CFLAGS += $(C_GCC4_FLAGS)
|
|
||||||
CPPFLAGS += $(CPP_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
|
|
||||||
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)
|
|
||||||
|
|
||||||
# This will break if we include other Makefiles, but is fine for now. It allows
|
|
||||||
# us to make a copy of this file that uses altered paths (ie. Makefile.mine)
|
|
||||||
# or other changes without mucking up the original.
|
|
||||||
MAKEFILE_NAME := $(CURDIR)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
|
|
||||||
|
|
||||||
$(BIN_DIR)/%.o: %.cpp
|
|
||||||
$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
|
|
||||||
|
|
||||||
all: check
|
|
||||||
mkdir -p $(BIN_DIR)
|
|
||||||
ln -sf ../smsdk_ext.cpp
|
|
||||||
if [ "$(USEMETA)" = "true" ]; then \
|
|
||||||
ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX); \
|
|
||||||
ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX); \
|
|
||||||
fi
|
|
||||||
$(MAKE) -f $(MAKEFILE_NAME) extension
|
|
||||||
|
|
||||||
check:
|
|
||||||
if [ "$(USEMETA)" = "true" ] && [ "$(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
|
|
||||||
|
|
||||||
extension: check $(OBJ_BIN)
|
|
||||||
$(CPP) $(INCLUDE) $(OBJ_BIN) $(LINK) -o $(BIN_DIR)/$(BINARY)
|
|
||||||
|
|
||||||
debug:
|
|
||||||
$(MAKE) -f $(MAKEFILE_NAME) all DEBUG=true
|
|
||||||
|
|
||||||
default: all
|
|
||||||
|
|
||||||
clean: check
|
|
||||||
rm -rf $(BIN_DIR)/*.o
|
|
||||||
rm -rf $(BIN_DIR)/$(BINARY)
|
|
||||||
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python:
|
|
||||||
import os
|
|
||||||
|
|
||||||
# This is where the files will be output to
|
|
||||||
# package is the default
|
|
||||||
builder.SetBuildFolder('package')
|
|
||||||
|
|
||||||
# Add any folders you need to this list
|
|
||||||
folder_list = [
|
|
||||||
'addons/sourcemod/extensions',
|
|
||||||
'addons/sourcemod/scripting/include',
|
|
||||||
'addons/sourcemod/gamedata'
|
|
||||||
]
|
|
||||||
|
|
||||||
if 'x86_64' in SM.target_archs:
|
|
||||||
folder_list.extend([
|
|
||||||
'addons/sourcemod/extensions/x64',
|
|
||||||
])
|
|
||||||
|
|
||||||
# Create the distribution folder hierarchy.
|
|
||||||
folder_map = {}
|
|
||||||
for folder in folder_list:
|
|
||||||
norm_folder = os.path.normpath(folder)
|
|
||||||
folder_map[folder] = builder.AddFolder(norm_folder)
|
|
||||||
|
|
||||||
# Copy binaries.
|
|
||||||
for cxx_task in SM.extensions:
|
|
||||||
if cxx_task.target.arch == 'x86_64':
|
|
||||||
builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions/x64'])
|
|
||||||
else:
|
|
||||||
builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])
|
|
||||||
|
|
||||||
# Do all straight-up file copies from the source tree.
|
|
||||||
def CopyFiles(src, dest, files):
|
|
||||||
if not dest:
|
|
||||||
dest = src
|
|
||||||
dest_entry = folder_map[dest]
|
|
||||||
for source_file in files:
|
|
||||||
source_path = os.path.join(builder.sourcePath, src, source_file)
|
|
||||||
dest_path = os.path.join(dest_entry.path, source_file)
|
|
||||||
if not os.path.isfile(str(dest_path)):
|
|
||||||
builder.AddCopy(source_path, dest_entry)
|
|
||||||
|
|
||||||
# Gamedata
|
|
||||||
CopyFiles('addons/sourcemod/gamedata', 'addons/sourcemod/gamedata',
|
|
||||||
[ 'CSSFixes.games.txt' ]
|
|
||||||
)
|
|
||||||
|
|
||||||
# Include
|
|
||||||
CopyFiles('addons/sourcemod/scripting/include', 'addons/sourcemod/scripting/include',
|
|
||||||
[ 'CSSFixes.inc' ]
|
|
||||||
)
|
|
||||||
|
|
||||||
# Autoload extension
|
|
||||||
CopyFiles('addons/sourcemod/extensions', 'addons/sourcemod/extensions',
|
|
||||||
[ 'CSSFixes.autoload' ]
|
|
||||||
)
|
|
||||||
12
README.md
12
README.md
@ -31,4 +31,14 @@ void CMovementSpeedMod::InputSpeedMod(inputdata_t &data)
|
|||||||
[...]
|
[...]
|
||||||
```
|
```
|
||||||
|
|
||||||
**NOP**'d out the block.
|
**NOP**'d out the block.
|
||||||
|
|
||||||
|
# Configuration
|
||||||
|
In cstrike/cfg/server.cfg add this
|
||||||
|
```
|
||||||
|
//============================================================================
|
||||||
|
// Late load support - since multiples things need to be init before load it
|
||||||
|
// The upcoming extensions can not use autoload file
|
||||||
|
|
||||||
|
sm exts load CSSFixes
|
||||||
|
```
|
||||||
|
|||||||
39
configure.py
39
configure.py
@ -1,39 +0,0 @@
|
|||||||
# vim: set ts=2 sw=2 tw=99 noet:
|
|
||||||
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('--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='Path to Metamod:Source')
|
|
||||||
parser.options.add_argument('--sm-path', type=str, dest='sm_path', default=None,
|
|
||||||
help='Path to SourceMod')
|
|
||||||
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: %default)')
|
|
||||||
parser.options.add_argument('--targets', type=str, dest='targets', default=None,
|
|
||||||
help="Override the target architecture (use commas to separate multiple targets).")
|
|
||||||
|
|
||||||
parser.Configure()
|
|
||||||
1
product.version
Normal file
1
product.version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.18.2
|
||||||
1
sm-ext-common
Submodule
1
sm-ext-common
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 2adde8cc6fdb3e32beee27349af1beb1769a5872
|
||||||
25
src/AMBuilder
Normal file
25
src/AMBuilder
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
|
||||||
|
import os
|
||||||
|
|
||||||
|
projectName = 'CSSFixes'
|
||||||
|
|
||||||
|
project = builder.LibraryProject(projectName)
|
||||||
|
project.sources += [
|
||||||
|
os.path.join(Extension.ext_root, 'src', 'extension.cpp'),
|
||||||
|
os.path.join(Extension.sm_root, 'public', 'smsdk_ext.cpp')
|
||||||
|
]
|
||||||
|
|
||||||
|
for sdk_name in Extension.sdks:
|
||||||
|
sdk = Extension.sdks[sdk_name]
|
||||||
|
if sdk['name'] in ['mock']:
|
||||||
|
continue
|
||||||
|
|
||||||
|
for cxx in builder.targets:
|
||||||
|
if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
|
||||||
|
continue
|
||||||
|
|
||||||
|
binary = Extension.HL2ExtConfig(project, builder, cxx, projectName + '.ext.' + sdk['extension'], sdk)
|
||||||
|
|
||||||
|
Extension.AddCDetour(binary)
|
||||||
|
|
||||||
|
Extension.extensions += builder.Add(project)
|
||||||
@ -1,33 +1,33 @@
|
|||||||
/**
|
/**
|
||||||
* vim: set ts=4 :
|
* vim: set ts=4 :
|
||||||
* =============================================================================
|
* =============================================================================
|
||||||
* SourceMod Sample Extension
|
* SourceMod Sample Extension
|
||||||
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
|
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
|
||||||
* =============================================================================
|
* =============================================================================
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it under
|
* 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
|
* the terms of the GNU General Public License, version 3.0, as published by the
|
||||||
* Free Software Foundation.
|
* Free Software Foundation.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
* 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
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
* details.
|
* details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
* As a special exception, AlliedModders LLC gives you permission to link the
|
* As a special exception, AlliedModders LLC gives you permission to link the
|
||||||
* code of this program (as well as its derivative works) to "Half-Life 2," the
|
* code of this program (as well as its derivative works) to "Half-Life 2," the
|
||||||
* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
|
* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
|
||||||
* by the Valve Corporation. You must obey the GNU General Public License in
|
* by the Valve Corporation. You must obey the GNU General Public License in
|
||||||
* all respects for all other code used. Additionally, AlliedModders LLC grants
|
* all respects for all other code used. Additionally, AlliedModders LLC grants
|
||||||
* this exception to all derivative works. AlliedModders LLC defines further
|
* this exception to all derivative works. AlliedModders LLC defines further
|
||||||
* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
|
* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
|
||||||
* or <http://www.sourcemod.net/license.php>.
|
* or <http://www.sourcemod.net/license.php>.
|
||||||
*
|
*
|
||||||
* Version: $Id$
|
* Version: $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "extension.h"
|
#include "extension.h"
|
||||||
#include "CDetour/detours.h"
|
#include "CDetour/detours.h"
|
||||||
@ -40,6 +40,9 @@
|
|||||||
#include <utlvector.h>
|
#include <utlvector.h>
|
||||||
#include <string_t.h>
|
#include <string_t.h>
|
||||||
|
|
||||||
|
#define VPROF_ENABLED
|
||||||
|
#include <tier0/vprof.h>
|
||||||
|
|
||||||
#define SetBit(A,I) ((A)[(I) >> 5] |= (1 << ((I) & 31)))
|
#define SetBit(A,I) ((A)[(I) >> 5] |= (1 << ((I) & 31)))
|
||||||
#define ClearBit(A,I) ((A)[(I) >> 5] &= ~(1 << ((I) & 31)))
|
#define ClearBit(A,I) ((A)[(I) >> 5] &= ~(1 << ((I) & 31)))
|
||||||
#define CheckBit(A,I) !!((A)[(I) >> 5] & (1 << ((I) & 31)))
|
#define CheckBit(A,I) !!((A)[(I) >> 5] & (1 << ((I) & 31)))
|
||||||
@ -149,69 +152,77 @@ static struct SrcdsPatch
|
|||||||
// 0: game_ui should not apply FL_ONTRAIN flag, else client prediction turns off
|
// 0: game_ui should not apply FL_ONTRAIN flag, else client prediction turns off
|
||||||
{
|
{
|
||||||
"_ZN7CGameUI5ThinkEv",
|
"_ZN7CGameUI5ThinkEv",
|
||||||
(unsigned char *)"\xC7\x44\x24\x04\x10\x00\x00\x00\x89\x34\x24\xE8\x00\x00\x00\x00",
|
(unsigned char *)"\x0F\x82\xC4\x03\x00\x00\x83\xEC\x08\x6A\x10\x53\xE8\x91\x00\xF5\xFF",
|
||||||
"xxxxxxxxxxxx????",
|
"xx????xx?x?xx????",
|
||||||
(unsigned char *)"\xC7\x44\x24\x04\x10\x00\x00\x00\x89\x34\x24\x90\x90\x90\x90\x90",
|
(unsigned char *)"\x0F\x82\xC4\x03\x00\x00\x83\xEC\x08\x6A\x10\x53\x90\x90\x90\x90\x90",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
// 1: player_speedmod should not turn off flashlight
|
// 1: player_speedmod should not turn off flashlight
|
||||||
{
|
{
|
||||||
"_ZN17CMovementSpeedMod13InputSpeedModER11inputdata_t",
|
"_ZN17CMovementSpeedMod13InputSpeedModER11inputdata_t",
|
||||||
(unsigned char *)"\xFF\x90\x8C\x05\x00\x00\x85\xC0\x0F\x85\x85\x02\x00\x00",
|
(unsigned char *)"\x8B\x90\xA4\x05\x00\x00\x81\xFA\x10\x6E\x3E\x00\x0F\x85\xC7\x02\x00\x00\x8B\x80\xA0\x05\x00\x00\x3D\x00\x6E\x3E\x00\x0F\x85\xEE\x02\x00\x00",
|
||||||
"xxxxxxxxxxxxxx",
|
"xx????xx????xx????xx????x????xx????",
|
||||||
(unsigned char *)"\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90",
|
(unsigned char *)"\x8B\x90\xA4\x05\x00\x00\x81\xFA\x10\x6E\x3E\x00\x0F\x84\xC7\x02\x00\x00\x8B\x80\xA0\x05\x00\x00\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
// 2: only select CT spawnpoints
|
// 2: only select CT spawnpoints
|
||||||
{
|
{
|
||||||
"_ZN9CCSPlayer19EntSelectSpawnPointEv",
|
"_ZN9CCSPlayer19EntSelectSpawnPointEv",
|
||||||
(unsigned char *)"\x89\x1C\x24\xE8\x00\x00\x00\x00\x83\xF8\x03\x74\x6B",
|
(unsigned char *)"\x74\x57\x83\xEC\x0C\x53\xE8\x6E\x34\xCA\xFF\x83\xC4\x10\x83\xF8\x02\x0F\x84",
|
||||||
"xxxx????xxxxx",
|
"x?xx?xx????xx?xx?xx",
|
||||||
(unsigned char *)"\x89\x1C\x24\x90\x90\x90\x90\x90\x90\x90\x90\xEB\x6B",
|
(unsigned char *)"\xEB\x57\x83\xEC\x0C\x53\xE8\x6E\x34\xCA\xFF\x83\xC4\x10\x83\xF8\x02\x0F\x84",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
// 3: don't check if we have T spawns
|
// 3: don't check if we have T spawns
|
||||||
{
|
{
|
||||||
"_ZN12CCSGameRules18NeededPlayersCheckERb",
|
"_ZN12CCSGameRules18NeededPlayersCheckERb",
|
||||||
(unsigned char *)"\x74\x0E\x8B\x83\x80\x02\x00\x00\x85\xC0\x0F\x85\x9E\x00\x00\x00\xC7\x04\x24\xAC\xF7\x87\x00\xE8\xC2\x82\x91\x00",
|
(unsigned char *)"\x74\x0A\x8B\x83\x94\x02\x00\x00\x85\xC0\x75\x4A\x83\xEC\x0C\x68\xE8\xCF\x93\x00\xE8\xA9\x46\x52\x00\x5A\x59",
|
||||||
"xxxxxxxxxxxxxxxx????????????",
|
"xxxx????xxx?xx?x????x????xx",
|
||||||
(unsigned char *)"\x0F\x85\xA8\x00\x00\x00\x8B\x83\x80\x02\x00\x00\x85\xC0\x0F\x85\x9A\x00\x00\x00\x90\x90\x90\x90\x90\x90\x90\x90",
|
(unsigned char *)"\x75\x54\x8B\x83\x94\x02\x00\x00\x85\xC0\x75\x4A\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
// 5: disable alive check in point_viewcontrol->Disable
|
// 5: disable alive check in point_viewcontrol->Disable
|
||||||
{
|
{
|
||||||
"_ZN14CTriggerCamera7DisableEv",
|
"_ZN14CTriggerCamera7DisableEv",
|
||||||
(unsigned char *)"\x8B\x10\x89\x04\x24\xFF\x92\x08\x01\x00\x00\x84\xC0\x0F\x84\x58\xFF\xFF\xFF",
|
(unsigned char *)"\x0F\x84\x47\x02\x00\x00\xF6\x83\x40\x01\x00\x00\x20\x0F\x85",
|
||||||
"xxxxxxx??xxxxxx?xxx",
|
"xx????xx?????xx",
|
||||||
(unsigned char *)"\x8B\x10\x89\x04\x24\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90",
|
(unsigned char *)"\x90\x90\x90\x90\x90\x90\xF6\x83\x40\x01\x00\x00\x20\x0F\x85",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
// 6: disable player->m_takedamage = DAMAGE_NO in point_viewcontrol->Enable
|
// 6: disable player->m_takedamage = DAMAGE_NO in point_viewcontrol->Enable
|
||||||
{
|
{
|
||||||
"_ZN14CTriggerCamera6EnableEv",
|
"_ZN14CTriggerCamera6EnableEv",
|
||||||
(unsigned char *)"\xC6\x86\x00\x00\x00\x00\x00\x8B\x83\x00\x00\x00\x00\xA8\x20",
|
(unsigned char *)"\xC6\x80\xFD\x00\x00\x00\x00\x8B\x83",
|
||||||
"xx?????xx????xx",
|
"xxxxxxxxx",
|
||||||
(unsigned char *)"\x90\x90\x90\x90\x90\x90\x90\x8B\x83\x00\x00\x00\x00\xA8\x20",
|
(unsigned char *)"\x90\x90\x90\x90\x90\x90\x90\x8B\x83",
|
||||||
"cstrike/bin/server_srv.so",
|
"cstrike/bin/server_srv.so",
|
||||||
0x600
|
0x600
|
||||||
},
|
},
|
||||||
// 7: disable player->m_takedamage = m_nOldTakeDamage in point_viewcontrol->Disable
|
// 7: disable player->m_takedamage = m_nOldTakeDamage in point_viewcontrol->Disable
|
||||||
{
|
{
|
||||||
"_ZN14CTriggerCamera7DisableEv",
|
"_ZN14CTriggerCamera7DisableEv",
|
||||||
(unsigned char *)"\x89\xF9\x38\x8E\xFD\x00\x00\x00\x0F\x84\xCA\xFD\xFF\xFF",
|
(unsigned char *)"\x74\x1A\x8B\x16\x8B\x92\x04\x02\x00\x00\x81\xFA\x30\xF9\x29\x00\x0F\x85",
|
||||||
"xxxx?xxxxxxxxx",
|
"x?xxxx????xx????xx",
|
||||||
(unsigned char *)"\x89\xF9\x38\x8E\xFD\x00\x00\x00\x90\xE9\xCA\xFD\xFF\xFF",
|
(unsigned char *)"\xEB\x1A\x8B\x16\x8B\x92\x04\x02\x00\x00\x81\xFA\x30\xF9\x29\x00\x0F\x85",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
// 8: userinfo stringtable don't write fakeclient field
|
// 8: userinfo stringtable don't write fakeclient field
|
||||||
{
|
{
|
||||||
"_ZN11CBaseClient12FillUserInfoER13player_info_s",
|
"_ZN11CBaseClient12FillUserInfoER13player_info_s",
|
||||||
(unsigned char *)"\xFF\x50\x70\x88\x46\x6C",
|
(unsigned char *)"\x88\x46\x6C",
|
||||||
"xxxxxx",
|
"xxx",
|
||||||
(unsigned char *)"\x90\x90\x90\x90\x90\x90",
|
(unsigned char *)"\x90\x90\x90",
|
||||||
"bin/engine_srv.so"
|
"bin/engine_srv.so"
|
||||||
},
|
},
|
||||||
// 9: fix server lagging resulting from too many ConMsgs due to packet spam
|
// 9: dont reset cash to 16000 when buying an item
|
||||||
|
{
|
||||||
|
"_ZN9CCSPlayer10AddAccountEibbPKc",
|
||||||
|
(unsigned char *)"\x3D\x80\x3E\x00\x00\x0F\x8F\x00\x00\x00\x00\x8D\x65",
|
||||||
|
"x????xx????xx",
|
||||||
|
(unsigned char *)"\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x8D\x65",
|
||||||
|
"cstrike/bin/server_srv.so"
|
||||||
|
},
|
||||||
|
// 10: fix server lagging resulting from too many ConMsgs due to packet spam
|
||||||
{
|
{
|
||||||
"_ZN8CNetChan19ProcessPacketHeaderEP11netpacket_s",
|
"_ZN8CNetChan19ProcessPacketHeaderEP11netpacket_s",
|
||||||
(unsigned char *)"_Z6ConMsgPKcz",
|
(unsigned char *)"_Z6ConMsgPKcz",
|
||||||
@ -221,7 +232,7 @@ static struct SrcdsPatch
|
|||||||
0x7d1, 100,
|
0x7d1, 100,
|
||||||
true, "bin/libtier0_srv.so"
|
true, "bin/libtier0_srv.so"
|
||||||
},
|
},
|
||||||
// 10: fix server lagging resulting from too many ConMsgs due to packet spam
|
// 11: fix server lagging resulting from too many ConMsgs due to packet spam
|
||||||
{
|
{
|
||||||
"_Z11NET_GetLongiP11netpacket_s",
|
"_Z11NET_GetLongiP11netpacket_s",
|
||||||
(unsigned char *)"Msg",
|
(unsigned char *)"Msg",
|
||||||
@ -231,7 +242,8 @@ static struct SrcdsPatch
|
|||||||
0x800, 100,
|
0x800, 100,
|
||||||
true, "bin/libtier0_srv.so"
|
true, "bin/libtier0_srv.so"
|
||||||
},
|
},
|
||||||
// 11: Always transmit point_viewcontrol (for debugging)
|
// 12: Always transmit point_viewcontrol (for debugging)
|
||||||
|
/*
|
||||||
{
|
{
|
||||||
"_ZN14CTriggerCamera19UpdateTransmitStateEv",
|
"_ZN14CTriggerCamera19UpdateTransmitStateEv",
|
||||||
(unsigned char *)"\x74\x16",
|
(unsigned char *)"\x74\x16",
|
||||||
@ -239,22 +251,32 @@ static struct SrcdsPatch
|
|||||||
(unsigned char *)"\xEB\x16",
|
(unsigned char *)"\xEB\x16",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
// 12: CTriggerCamera::FollowTarget: Don't early return when the player handle is null
|
*/
|
||||||
|
// 13: CTriggerCamera::FollowTarget: Don't early return when the player handle is null
|
||||||
{
|
{
|
||||||
"_ZN14CTriggerCamera12FollowTargetEv",
|
"_ZN14CTriggerCamera12FollowTargetEv",
|
||||||
(unsigned char *)"\x74\x1B\x89\xD0\x25\x00\x00\x00\x00\xC1\xE0\x04",
|
(unsigned char *)"\x0F\x84\xD6\x02\x00\x00\x83\xFA\xFF",
|
||||||
"xxxxx????xxx",
|
"xxxxxxxxx",
|
||||||
(unsigned char *)"\xEB\x23\x89\xD0\x25\x00\x00\x00\x00\xC1\xE0\x04",
|
(unsigned char *)"\x90\x90\x90\x90\x90\x90\x83\xFA\xFF",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
// 13: CGameMovement::LadderMove NOP out player->SetGravity( 0 );
|
// 14: CGameMovement::LadderMove NOP out player->SetGravity( 0 );
|
||||||
|
// This is in a cloned function which has a weird symbol (_ZN13CGameMovement10LadderMoveEv_part_0) so I went with the function right before it
|
||||||
{
|
{
|
||||||
"_ZN13CGameMovement10LadderMoveEv",
|
"_ZN13CGameMovement12CheckFallingEv",
|
||||||
(unsigned char *)"\xC7\x80\x78\x02\x00\x00\x00\x00\x00\x00",
|
(unsigned char *)"\xC7\x80\xA4\x02\x00\x00\x00\x00\x00\x00\x8B\x03\x8B\x80",
|
||||||
"xxxxxxx???",
|
"xx????????xxxx",
|
||||||
(unsigned char *)"\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90",
|
(unsigned char *)"\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x8B\x03\x8B\x80",
|
||||||
"cstrike/bin/server_srv.so"
|
"cstrike/bin/server_srv.so"
|
||||||
},
|
},
|
||||||
|
// 18: Remove weird filename handle check in CZipPackFile::GetFileInfo that broke loading mixed case files in bsp pakfiles
|
||||||
|
{
|
||||||
|
"_ZN12CZipPackFile11GetFileInfoEPKcRiRxS2_S2_Rt",
|
||||||
|
(unsigned char *)"\x75\x00\x8B\x09",
|
||||||
|
"x?xx",
|
||||||
|
(unsigned char *)"\x90\x90\x8B\x09",
|
||||||
|
"bin/dedicated_srv.so"
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
class CBaseEntity;
|
class CBaseEntity;
|
||||||
@ -288,9 +310,9 @@ uintptr_t FindPattern(uintptr_t BaseAddr, const unsigned char *pData, const char
|
|||||||
uintptr_t FindFunctionCall(uintptr_t BaseAddr, uintptr_t Function, size_t MaxSize);
|
uintptr_t FindFunctionCall(uintptr_t BaseAddr, uintptr_t Function, size_t MaxSize);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file extension.cpp
|
* @file extension.cpp
|
||||||
* @brief Implement extension code here.
|
* @brief Implement extension code here.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
CSSFixes g_Interface;
|
CSSFixes g_Interface;
|
||||||
SMEXT_LINK(&g_Interface);
|
SMEXT_LINK(&g_Interface);
|
||||||
@ -326,7 +348,6 @@ DETOUR_DECL_MEMBER1(DETOUR_InputTestActivator, void, inputdata_t *, inputdata)
|
|||||||
|
|
||||||
const char *pszNonEdicts[] =
|
const char *pszNonEdicts[] =
|
||||||
{
|
{
|
||||||
"ambient_generic",
|
|
||||||
"game_score",
|
"game_score",
|
||||||
"game_text",
|
"game_text",
|
||||||
"game_ui",
|
"game_ui",
|
||||||
@ -342,6 +363,8 @@ const char *pszNonEdicts[] =
|
|||||||
|
|
||||||
DETOUR_DECL_MEMBER1(DETOUR_PostConstructor, void, const char *, szClassname)
|
DETOUR_DECL_MEMBER1(DETOUR_PostConstructor, void, const char *, szClassname)
|
||||||
{
|
{
|
||||||
|
VPROF_ENTER_SCOPE("CSSFixes::DETOUR_PostConstructor");
|
||||||
|
|
||||||
CBaseEntity *pEntity = (CBaseEntity *)this;
|
CBaseEntity *pEntity = (CBaseEntity *)this;
|
||||||
|
|
||||||
static datamap_t *pMap = gamehelpers->GetDataMap(pEntity);
|
static datamap_t *pMap = gamehelpers->GetDataMap(pEntity);
|
||||||
@ -371,6 +394,8 @@ DETOUR_DECL_MEMBER1(DETOUR_PostConstructor, void, const char *, szClassname)
|
|||||||
}
|
}
|
||||||
|
|
||||||
DETOUR_MEMBER_CALL(DETOUR_PostConstructor)(szClassname);
|
DETOUR_MEMBER_CALL(DETOUR_PostConstructor)(szClassname);
|
||||||
|
|
||||||
|
VPROF_EXIT_SCOPE();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implementation for custom filter entities
|
// Implementation for custom filter entities
|
||||||
@ -424,15 +449,23 @@ DETOUR_DECL_MEMBER2(DETOUR_PassesFilterImpl, bool, CBaseEntity*, pCaller, CBaseE
|
|||||||
// Switch new entity classnames to ones that can be instantiated while keeping the classname keyvalue intact so it can be used later
|
// Switch new entity classnames to ones that can be instantiated while keeping the classname keyvalue intact so it can be used later
|
||||||
DETOUR_DECL_STATIC2(DETOUR_CreateEntityByName, CBaseEntity*, const char*, className, int, iForceEdictIndex)
|
DETOUR_DECL_STATIC2(DETOUR_CreateEntityByName, CBaseEntity*, const char*, className, int, iForceEdictIndex)
|
||||||
{
|
{
|
||||||
|
VPROF_ENTER_SCOPE("CSSFixes::DETOUR_CreateEntityByName");
|
||||||
|
|
||||||
// Nice of valve to expose CBaseFilter as filter_base :)
|
// Nice of valve to expose CBaseFilter as filter_base :)
|
||||||
if (strcasecmp(className, "filter_activator_context") == 0)
|
if (strcasecmp(className, "filter_activator_context") == 0)
|
||||||
className = "filter_base";
|
className = "filter_base";
|
||||||
|
|
||||||
return DETOUR_STATIC_CALL(DETOUR_CreateEntityByName)(className, iForceEdictIndex);
|
CBaseEntity *pEntity = DETOUR_STATIC_CALL(DETOUR_CreateEntityByName)(className, iForceEdictIndex);
|
||||||
|
|
||||||
|
VPROF_EXIT_SCOPE();
|
||||||
|
|
||||||
|
return pEntity;
|
||||||
}
|
}
|
||||||
|
|
||||||
DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char *, szValue)
|
DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char *, szValue)
|
||||||
{
|
{
|
||||||
|
VPROF_ENTER_SCOPE("CSSFixes::DETOUR_KeyValue");
|
||||||
|
|
||||||
CBaseEntity *pEntity = (CBaseEntity *)this;
|
CBaseEntity *pEntity = (CBaseEntity *)this;
|
||||||
|
|
||||||
// Fix crash bug in engine
|
// Fix crash bug in engine
|
||||||
@ -474,7 +507,11 @@ DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char *
|
|||||||
vecAbsVelocity->Init(tmp[0], tmp[1], tmp[2]);
|
vecAbsVelocity->Init(tmp[0], tmp[1], tmp[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return DETOUR_MEMBER_CALL(DETOUR_KeyValue)(szKeyName, szValue);
|
bool bHandled = DETOUR_MEMBER_CALL(DETOUR_KeyValue)(szKeyName, szValue);
|
||||||
|
|
||||||
|
VPROF_EXIT_SCOPE();
|
||||||
|
|
||||||
|
return bHandled;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Ignore players in +USE trace */
|
/* Ignore players in +USE trace */
|
||||||
@ -492,7 +529,7 @@ DETOUR_DECL_MEMBER3(DETOUR_CTraceFilterSimple, void, const IHandleEntity *, pass
|
|||||||
DETOUR_MEMBER_CALL(DETOUR_CTraceFilterSimple)(passedict, collisionGroup, pExtraShouldHitFunc);
|
DETOUR_MEMBER_CALL(DETOUR_CTraceFilterSimple)(passedict, collisionGroup, pExtraShouldHitFunc);
|
||||||
|
|
||||||
// If we're in FindUseEntity right now then switch out the VTable
|
// If we're in FindUseEntity right now then switch out the VTable
|
||||||
if(g_InFindUseEntity)
|
if (g_InFindUseEntity)
|
||||||
*(uintptr_t *)this = g_CTraceFilterNoNPCsOrPlayer;
|
*(uintptr_t *)this = g_CTraceFilterNoNPCsOrPlayer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -768,50 +805,68 @@ bool CSSFixes::SDK_OnLoad(char *error, size_t maxlength, bool late)
|
|||||||
g_SH_SkipTwoEntitiesShouldHitEntity = SH_ADD_DVPHOOK(CTraceFilterSkipTwoEntities, ShouldHitEntity, g_CTraceFilterSkipTwoEntities, SH_STATIC(ShouldHitEntity), true);
|
g_SH_SkipTwoEntitiesShouldHitEntity = SH_ADD_DVPHOOK(CTraceFilterSkipTwoEntities, ShouldHitEntity, g_CTraceFilterSkipTwoEntities, SH_STATIC(ShouldHitEntity), true);
|
||||||
g_SH_SimpleShouldHitEntity = SH_ADD_DVPHOOK(CTraceFilterSimple, ShouldHitEntity, g_CTraceFilterSimple, SH_STATIC(ShouldHitEntity), true);
|
g_SH_SimpleShouldHitEntity = SH_ADD_DVPHOOK(CTraceFilterSimple, ShouldHitEntity, g_CTraceFilterSimple, SH_STATIC(ShouldHitEntity), true);
|
||||||
|
|
||||||
|
bool bSuccess = true;
|
||||||
|
|
||||||
// Apply all patches
|
// Apply all patches
|
||||||
for(size_t i = 0; i < sizeof(gs_Patches) / sizeof(*gs_Patches); i++)
|
for(size_t i = 0; i < sizeof(gs_Patches) / sizeof(*gs_Patches); i++)
|
||||||
{
|
{
|
||||||
struct SrcdsPatch *pPatch = &gs_Patches[i];
|
struct SrcdsPatch *pPatch = &gs_Patches[i];
|
||||||
int PatchLen = strlen(pPatch->pPatchPattern);
|
int PatchLen = strlen(pPatch->pPatchPattern);
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
HMODULE pBinary = LoadLibrary(pPatch->pLibrary);
|
||||||
|
#else
|
||||||
void *pBinary = dlopen(pPatch->pLibrary, RTLD_NOW);
|
void *pBinary = dlopen(pPatch->pLibrary, RTLD_NOW);
|
||||||
|
#endif
|
||||||
if(!pBinary)
|
if(!pBinary)
|
||||||
{
|
{
|
||||||
snprintf(error, maxlength, "Could not dlopen %s", pPatch->pLibrary);
|
g_pSM->LogError(myself, "Could not dlopen %s", pPatch->pLibrary);
|
||||||
SDK_OnUnload();
|
bSuccess = false;
|
||||||
return false;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
pPatch->pAddress = (uintptr_t)memutils->ResolveSymbol(pBinary, pPatch->pSignature);
|
pPatch->pAddress = (uintptr_t)memutils->ResolveSymbol(pBinary, pPatch->pSignature);
|
||||||
|
#ifdef _WIN32
|
||||||
|
FreeLibrary(pBinary);
|
||||||
|
#else
|
||||||
dlclose(pBinary);
|
dlclose(pBinary);
|
||||||
|
#endif
|
||||||
if(!pPatch->pAddress)
|
if(!pPatch->pAddress)
|
||||||
{
|
{
|
||||||
snprintf(error, maxlength, "Could not find symbol: %s in %s (%p)",
|
g_pSM->LogError(myself, "Could not find symbol: %s in %s (%p)",
|
||||||
pPatch->pSignature, pPatch->pLibrary, pBinary);
|
pPatch->pSignature, pPatch->pLibrary, pBinary);
|
||||||
SDK_OnUnload();
|
bSuccess = false;
|
||||||
return false;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
SrcdsPatch::Restore **ppRestore = &pPatch->pRestore;
|
SrcdsPatch::Restore **ppRestore = &pPatch->pRestore;
|
||||||
|
|
||||||
if(pPatch->functionCall)
|
if(pPatch->functionCall)
|
||||||
{
|
{
|
||||||
void *pFunctionBinary = dlopen(pPatch->pFunctionLibrary, RTLD_NOW);
|
#ifdef _WIN32
|
||||||
|
HMODULE pFunctionBinary = LoadLibrary(pPatch->pFunctionLibrary);
|
||||||
|
#else
|
||||||
|
void* pFunctionBinary = dlopen(pPatch->pFunctionLibrary, RTLD_NOW);
|
||||||
|
#endif
|
||||||
if(!pFunctionBinary)
|
if(!pFunctionBinary)
|
||||||
{
|
{
|
||||||
snprintf(error, maxlength, "Could not dlopen %s", pPatch->pFunctionLibrary);
|
g_pSM->LogError(myself, "Could not dlopen %s", pPatch->pFunctionLibrary);
|
||||||
SDK_OnUnload();
|
bSuccess = false;
|
||||||
return false;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
pPatch->pSignatureAddress = (uintptr_t)memutils->ResolveSymbol(pFunctionBinary, (char *)pPatch->pPatchSignature);
|
pPatch->pSignatureAddress = (uintptr_t)memutils->ResolveSymbol(pFunctionBinary, (char *)pPatch->pPatchSignature);
|
||||||
|
#ifdef _WIN32
|
||||||
|
FreeLibrary(pFunctionBinary);
|
||||||
|
#else
|
||||||
dlclose(pFunctionBinary);
|
dlclose(pFunctionBinary);
|
||||||
|
#endif
|
||||||
if(!pPatch->pSignatureAddress)
|
if(!pPatch->pSignatureAddress)
|
||||||
{
|
{
|
||||||
snprintf(error, maxlength, "Could not find patch signature symbol: %s in %s (%p)",
|
g_pSM->LogError(myself, "Could not find patch signature symbol: %s in %s (%p)",
|
||||||
(char *)pPatch->pPatchSignature, pPatch->pFunctionLibrary, pFunctionBinary);
|
(char *)pPatch->pPatchSignature, pPatch->pFunctionLibrary, pFunctionBinary);
|
||||||
SDK_OnUnload();
|
bSuccess = false;
|
||||||
return false;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -830,9 +885,9 @@ bool CSSFixes::SDK_OnLoad(char *error, size_t maxlength, bool late)
|
|||||||
if(found)
|
if(found)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
snprintf(error, maxlength, "Could not find patch signature for symbol: %s", pPatch->pSignature);
|
g_pSM->LogError(myself, "Could not find patch signature for symbol: %s", pPatch->pSignature);
|
||||||
SDK_OnUnload();
|
bSuccess = false;
|
||||||
return false;
|
continue;
|
||||||
}
|
}
|
||||||
ofs = pPatchAddress - pPatch->pAddress + PatchLen;
|
ofs = pPatchAddress - pPatch->pAddress + PatchLen;
|
||||||
|
|
||||||
@ -854,6 +909,12 @@ bool CSSFixes::SDK_OnLoad(char *error, size_t maxlength, bool late)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!bSuccess)
|
||||||
|
{
|
||||||
|
SDK_OnUnload();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,12 +37,14 @@
|
|||||||
* @brief Contains macros for configuring basic extension information.
|
* @brief Contains macros for configuring basic extension information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
/* Basic information exposed publicly */
|
/* Basic information exposed publicly */
|
||||||
#define SMEXT_CONF_NAME "CSSFixes"
|
#define SMEXT_CONF_NAME "CSSFixes"
|
||||||
#define SMEXT_CONF_DESCRIPTION "Patches bugs in the CSS server binary and more..."
|
#define SMEXT_CONF_DESCRIPTION "Patches bugs in the CSS server binary and more..."
|
||||||
#define SMEXT_CONF_VERSION "1.18"
|
#define SMEXT_CONF_VERSION "1.18"
|
||||||
#define SMEXT_CONF_AUTHOR "BotoX"
|
#define SMEXT_CONF_AUTHOR "BotoX"
|
||||||
#define SMEXT_CONF_URL ""
|
#define SMEXT_CONF_URL SM_FULL_VERSION
|
||||||
#define SMEXT_CONF_LOGTAG "CSSFIXES"
|
#define SMEXT_CONF_LOGTAG "CSSFIXES"
|
||||||
#define SMEXT_CONF_LICENSE "GPL"
|
#define SMEXT_CONF_LICENSE "GPL"
|
||||||
#define SMEXT_CONF_DATESTRING __DATE__
|
#define SMEXT_CONF_DATESTRING __DATE__
|
||||||
103
version.rc
103
version.rc
@ -1,103 +0,0 @@
|
|||||||
// Microsoft Visual C++ generated resource script.
|
|
||||||
//
|
|
||||||
//#include "resource.h"
|
|
||||||
|
|
||||||
#define APSTUDIO_READONLY_SYMBOLS
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Generated from the TEXTINCLUDE 2 resource.
|
|
||||||
//
|
|
||||||
#include "winres.h"
|
|
||||||
|
|
||||||
#include <sourcemod_version.h>
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
#undef APSTUDIO_READONLY_SYMBOLS
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
// English (U.S.) resources
|
|
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
|
||||||
#ifdef _WIN32
|
|
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
|
||||||
#pragma code_page(1252)
|
|
||||||
#endif //_WIN32
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Version
|
|
||||||
//
|
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
|
||||||
FILEVERSION SM_VERSION_FILE
|
|
||||||
PRODUCTVERSION SM_VERSION_FILE
|
|
||||||
FILEFLAGSMASK 0x17L
|
|
||||||
#ifdef _DEBUG
|
|
||||||
FILEFLAGS 0x1L
|
|
||||||
#else
|
|
||||||
FILEFLAGS 0x0L
|
|
||||||
#endif
|
|
||||||
FILEOS 0x4L
|
|
||||||
FILETYPE 0x2L
|
|
||||||
FILESUBTYPE 0x0L
|
|
||||||
BEGIN
|
|
||||||
BLOCK "StringFileInfo"
|
|
||||||
BEGIN
|
|
||||||
BLOCK "000004b0"
|
|
||||||
BEGIN
|
|
||||||
VALUE "Comments", "SourceMod Extension"
|
|
||||||
VALUE "FileDescription", "SourceMod Extension"
|
|
||||||
VALUE "FileVersion", SM_VERSION_STRING
|
|
||||||
VALUE "InternalName", "SourceMod Extension"
|
|
||||||
VALUE "LegalCopyright", "Copyright (c) 2004-2022, AlliedModders LLC"
|
|
||||||
VALUE "OriginalFilename", BINARY_NAME
|
|
||||||
VALUE "ProductName", "SourceMod Extension"
|
|
||||||
VALUE "ProductVersion", SM_VERSION_STRING
|
|
||||||
END
|
|
||||||
END
|
|
||||||
BLOCK "VarFileInfo"
|
|
||||||
BEGIN
|
|
||||||
VALUE "Translation", 0x0, 1200
|
|
||||||
END
|
|
||||||
END
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef APSTUDIO_INVOKED
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// TEXTINCLUDE
|
|
||||||
//
|
|
||||||
|
|
||||||
1 TEXTINCLUDE
|
|
||||||
BEGIN
|
|
||||||
"resource.h\0"
|
|
||||||
END
|
|
||||||
|
|
||||||
2 TEXTINCLUDE
|
|
||||||
BEGIN
|
|
||||||
"#include ""winres.h""\r\n"
|
|
||||||
"\0"
|
|
||||||
END
|
|
||||||
|
|
||||||
3 TEXTINCLUDE
|
|
||||||
BEGIN
|
|
||||||
"\r\n"
|
|
||||||
"\0"
|
|
||||||
END
|
|
||||||
|
|
||||||
#endif // APSTUDIO_INVOKED
|
|
||||||
|
|
||||||
#endif // English (U.S.) resources
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef APSTUDIO_INVOKED
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Generated from the TEXTINCLUDE 3 resource.
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
|
||||||
#endif // not APSTUDIO_INVOKED
|
|
||||||
Loading…
Reference in New Issue
Block a user