diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 6226037..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-name: Build
-
-on:
- push:
- branches: [ master ]
-
-jobs:
- build:
-
- name: Build on ${{ matrix.os_short }}
- runs-on: ${{ matrix.os }}
-
- strategy:
- fail-fast: false
- matrix:
- os:
- - ubuntu-18.04
- - windows-latest
- include:
- - os: ubuntu-18.04
- os_short: linux
- - os: windows-latest
- os_short: windows
-
- steps:
-
- - name: Setup Python
- uses: actions/setup-python@v2
- with:
- python-version: 3.9
-
- - name: Checkout AMBuild
- uses: actions/checkout@v2
- with:
- repository: alliedmodders/ambuild
- path: ambuild
-
- - name: Install AMBuild
- uses: BSFishy/pip-action@v1
- with:
- packages: ./ambuild
-
- - name: Install dependencies (Linux)
- if: runner.os == 'Linux'
- run: |
- sudo dpkg --add-architecture i386
- sudo apt-get update
- sudo apt-get install -y gcc-multilib g++-multilib llvm-10 clang-10
-
- - name: Select clang compiler (Linux)
- if: runner.os == 'Linux'
- run: |
- echo "CC=clang" >> $GITHUB_ENV
- echo "CXX=clang++" >> $GITHUB_ENV
- clang --version
- clang++ --version
-
- - name: Find Visual C++ compilers and make all environment variables global (Windows)
- if: runner.os == 'Windows'
- shell: cmd
- run: |
- :: See https://github.com/microsoft/vswhere/wiki/Find-VC
- for /f "usebackq delims=*" %%i in (`vswhere -latest -property installationPath`) do (
- call "%%i"\Common7\Tools\vsdevcmd.bat -arch=x86 -host_arch=x64
- )
-
- :: Loop over all environment variables and make them global.
- for /f "delims== tokens=1,2" %%a in ('set') do (
- echo>>"%GITHUB_ENV%" %%a=%%b
- )
-
- - name: Checkout MetaMod
- uses: actions/checkout@v2
- with:
- repository: alliedmodders/metamod-source
- path: metamod-source
- submodules: recursive
-
- - name: Checkout SourceMod
- uses: actions/checkout@v2
- with:
- repository: alliedmodders/sourcemod
- ref: 1.11-dev
- path: sourcemod
- submodules: recursive
-
- - name: Checkout hl2sdk-csgo
- uses: actions/checkout@v2
- with:
- repository: alliedmodders/hl2sdk
- ref: csgo
- path: hl2sdk-csgo
-
- - name: Checkout hl2sdk-insurgency
- uses: actions/checkout@v2
- with:
- repository: alliedmodders/hl2sdk
- ref: insurgency
- path: hl2sdk-insurgency
-
- - name: Checkout Project
- uses: actions/checkout@v2
- with:
- fetch-depth: 99999
- path: extension
-
- - name: Build
- working-directory: extension
- shell: bash
- run: |
- mkdir build && cd build
- python ../configure.py --enable-optimize --sdks=csgo
- ambuild
-
- - name: Upload artifact
- uses: actions/upload-artifact@v2
- with:
- name: ${{ runner.os }}
- path: extension/build/package
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..ec3a4dc
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,19 @@
+name: Build AlliedModders Extension
+
+on:
+ push:
+ branches:
+ - master
+ - main
+ tags:
+ - "*"
+ pull_request:
+ branches:
+ - master
+ - main
+
+jobs:
+ build-release-extension:
+ uses: srcdslab/ci-workflows/.github/workflows/shared_build_release_am_extension.yml@v1
+ with:
+ sdks: "css"
diff --git a/.gitignore b/.gitignore
index 3e759b7..4197507 100644
--- a/.gitignore
+++ b/.gitignore
@@ -328,3 +328,12 @@ ASALocalRun/
# MFractors (Xamarin productivity tool) working folder
.mfractor/
+
+# Custom
+build
+Containerfile
+.venv
+safetyhook
+ambuild
+*.env
+*.ps1
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1a3a667
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "sm-ext-common"]
+ path = sm-ext-common
+ url = https://github.com/srcdslab/sm-ext-common.git
diff --git a/AMBuildScript b/AMBuildScript
deleted file mode 100644
index 50390b5..0000000
--- a/AMBuildScript
+++ /dev/null
@@ -1,449 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
-import os, sys
-
-# Simple extensions do not need to modify this file.
-
-class SDK(object):
- def __init__(self, sdk, ext, aDef, name, platform, dir):
- self.folder = 'hl2sdk-' + dir
- self.envvar = sdk
- self.ext = ext
- self.code = aDef
- self.define = name
- self.platform = platform
- self.name = dir
- self.path = None # Actual path
-
-WinOnly = ['windows']
-WinLinux = ['windows', 'linux']
-WinLinuxMac = ['windows', 'linux', 'mac']
-
-PossibleSDKs = {
- 'episode1': SDK('HL2SDK', '1.ep1', '1', 'EPISODEONE', WinLinux, 'episode1'),
- 'ep2': SDK('HL2SDKOB', '2.ep2', '3', 'ORANGEBOX', WinLinux, 'orangebox'),
- 'css': SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'),
- 'hl2dm': SDK('HL2SDKHL2DM', '2.hl2dm', '7', 'HL2DM', WinLinuxMac, 'hl2dm'),
- 'dods': SDK('HL2SDKDODS', '2.dods', '8', 'DODS', WinLinuxMac, 'dods'),
- 'sdk2013': SDK('HL2SDK2013', '2.sdk2013', '9', 'SDK2013', WinLinuxMac, 'sdk2013'),
- 'tf2': SDK('HL2SDKTF2', '2.tf2', '11', 'TF2', WinLinuxMac, 'tf2'),
- 'l4d': SDK('HL2SDKL4D', '2.l4d', '12', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
- 'nucleardawn': SDK('HL2SDKND', '2.nd', '13', 'NUCLEARDAWN', WinLinuxMac, 'nucleardawn'),
- 'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '15', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
- 'darkm': SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
- 'swarm': SDK('HL2SDK-SWARM', '2.swarm', '16', 'ALIENSWARM', WinOnly, 'swarm'),
- 'bgt': SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
- 'eye': SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
- 'csgo': SDK('HL2SDKCSGO', '2.csgo', '21', 'CSGO', WinLinuxMac, 'csgo'),
- 'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '17', 'PORTAL2', [], 'portal2'),
- 'blade': SDK('HL2SDKBLADE', '2.blade', '18', 'BLADE', WinLinux, 'blade'),
- 'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'),
- 'contagion': SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'),
- 'bms': SDK('HL2SDKBMS', '2.bms', '10', 'BMS', WinLinux, 'bms'),
- 'doi': SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'),
-}
-
-def ResolveEnvPath(env, folder):
- 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))
-
-class ExtensionConfig(object):
- def __init__(self):
- self.sdks = {}
- self.binaries = []
- self.extensions = []
- self.generated_headers = None
- self.mms_root = None
- self.sm_root = None
-
- @property
- def tag(self):
- if builder.options.debug == '1':
- return 'Debug'
- return 'Release'
-
- def detectSDKs(self):
- sdk_list = builder.options.sdks.split(',')
- use_all = sdk_list[0] == 'all'
- use_present = sdk_list[0] == 'present'
-
- for sdk_name in PossibleSDKs:
- sdk = PossibleSDKs[sdk_name]
- if builder.target_platform in sdk.platform:
- 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:
- raise Exception('At least one SDK must be available.')
-
- if builder.options.sm_path:
- self.sm_root = builder.options.sm_path
- else:
- self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.8')
- if not self.sm_root:
- self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod')
- if not self.sm_root:
- self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod-central')
-
- if not self.sm_root or not os.path.isdir(self.sm_root):
- raise Exception('Could not find a source copy of SourceMod')
- self.sm_root = Normalize(self.sm_root)
-
- if builder.options.mms_path:
- self.mms_root = builder.options.mms_path
- else:
- self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
- if not self.mms_root:
- self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
- if not self.mms_root:
- self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central')
-
- if not self.mms_root or not os.path.isdir(self.mms_root):
- raise Exception('Could not find a source copy of Metamod:Source')
- self.mms_root = Normalize(self.mms_root)
-
- def configure(self):
- cxx = builder.DetectCompilers()
-
- if cxx.like('gcc'):
- self.configure_gcc(cxx)
- elif cxx.vendor == '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 builder.target_platform == 'linux':
- self.configure_linux(cxx)
- elif builder.target_platform == 'mac':
- self.configure_mac(cxx)
- elif builder.target_platform == 'windows':
- self.configure_windows(cxx)
-
- # Finish up.
- cxx.includes += [
- os.path.join(self.sm_root, 'public'),
- ]
-
- def configure_gcc(self, cxx):
- cxx.defines += [
- 'stricmp=strcasecmp',
- '_stricmp=strcasecmp',
- '_snprintf=snprintf',
- '_vsnprintf=vsnprintf',
- 'HAVE_STDINT_H',
- 'GNUC',
- ]
- cxx.cflags += [
- '-pipe',
- '-fno-strict-aliasing',
- '-Wall',
- '-Werror',
- '-Wno-unused',
- '-Wno-switch',
- '-Wno-array-bounds',
- '-msse',
- '-m32',
- '-fvisibility=hidden',
- ]
- cxx.cxxflags += [
- '-std=c++14',
- '-fno-exceptions',
- '-fno-threadsafe-statics',
- '-Wno-non-virtual-dtor',
- '-Wno-overloaded-virtual',
- '-Wno-null-dereference',
- '-fvisibility-inlines-hidden',
- ]
- cxx.linkflags += ['-m32']
-
- have_gcc = cxx.vendor == 'gcc'
- have_clang = cxx.vendor == 'clang'
- if cxx.version >= 'clang-3.6':
- cxx.cxxflags += ['-Wno-inconsistent-missing-override']
- if have_clang or (cxx.version >= 'gcc-4.6'):
- cxx.cflags += ['-Wno-narrowing']
- if have_clang or (cxx.version >= 'gcc-4.7'):
- cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
- if cxx.version >= 'gcc-4.8':
- cxx.cflags += ['-Wno-unused-result']
-
- if have_clang:
- cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
- if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
- cxx.cxxflags += ['-Wno-deprecated-register']
- else:
- cxx.cxxflags += ['-Wno-deprecated']
- cxx.cflags += ['-Wno-sometimes-uninitialized']
-
- if have_gcc:
- cxx.cflags += ['-mfpmath=sse']
-
- if builder.options.opt == '1':
- cxx.cflags += ['-O3']
-
- def configure_msvc(self, cxx):
- if builder.options.debug == '1':
- cxx.cflags += ['/MTd']
- cxx.linkflags += ['/NODEFAULTLIB:libcmt']
- else:
- cxx.cflags += ['/MT']
- cxx.defines += [
- '_CRT_SECURE_NO_DEPRECATE',
- '_CRT_SECURE_NO_WARNINGS',
- '_CRT_NONSTDC_NO_DEPRECATE',
- '_ITERATOR_DEBUG_LEVEL=0',
- ]
- cxx.cflags += [
- '/W3',
- ]
- cxx.cxxflags += [
- '/EHsc',
- '/GR-',
- '/TP',
- ]
- cxx.linkflags += [
- '/MACHINE:X86',
- 'kernel32.lib',
- 'user32.lib',
- 'gdi32.lib',
- 'winspool.lib',
- 'comdlg32.lib',
- 'advapi32.lib',
- 'shell32.lib',
- 'ole32.lib',
- 'oleaut32.lib',
- 'uuid.lib',
- 'odbc32.lib',
- 'odbccp32.lib',
- ]
-
- if builder.options.opt == '1':
- cxx.cflags += ['/Ox', '/Zo']
- cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
-
- if builder.options.debug == '1':
- cxx.cflags += ['/Od', '/RTC1']
-
- # This needs to be after our optimization flags which could otherwise disable it.
- # Don't omit the frame pointer.
- cxx.cflags += ['/Oy-']
-
- def configure_linux(self, cxx):
- cxx.defines += ['_LINUX', 'POSIX']
- cxx.linkflags += ['-Wl,--exclude-libs,ALL', '-lm']
- if cxx.vendor == 'gcc':
- cxx.linkflags += ['-static-libgcc']
- elif cxx.vendor == 'clang':
- cxx.linkflags += ['-lgcc_eh']
-
- def configure_mac(self, cxx):
- cxx.defines += ['OSX', '_OSX', 'POSIX']
- cxx.cflags += ['-mmacosx-version-min=10.5']
- cxx.linkflags += [
- '-mmacosx-version-min=10.5',
- '-arch', 'i386',
- '-lstdc++',
- '-stdlib=libstdc++',
- ]
- cxx.cxxflags += ['-stdlib=libstdc++']
-
- def configure_windows(self, cxx):
- cxx.defines += ['WIN32', '_WINDOWS']
-
- def ConfigureForExtension(self, context, compiler):
- compiler.cxxincludes += [
- os.path.join(context.currentSourcePath),
- os.path.join(context.currentSourcePath, 'sdk'),
- os.path.join(self.sm_root, 'public'),
- os.path.join(self.sm_root, 'public', 'extensions'),
- os.path.join(self.sm_root, 'sourcepawn', 'include'),
- os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
- os.path.join(self.sm_root, 'public', 'amtl'),
- ]
- return compiler
-
- def ConfigureForHL2(self, binary, sdk):
- compiler = binary.compiler
-
- if sdk.name == 'episode1':
- mms_path = os.path.join(self.mms_root, 'core-legacy')
- else:
- mms_path = os.path.join(self.mms_root, 'core')
-
- compiler.cxxincludes += [
- os.path.join(mms_path),
- os.path.join(mms_path, 'sourcehook'),
- ]
-
- defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs]
- compiler.defines += defines
-
- paths = [
- ['public'],
- ['public', 'engine'],
- ['public', 'mathlib'],
- ['public', 'vstdlib'],
- ['public', 'tier0'],
- ['public', 'tier1']
- ]
- if 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', 'COMPILER_MSVC32']
- else:
- compiler.defines += ['COMPILER_GCC']
-
- # For everything after Swarm, this needs to be defined for entity networking
- # to work properly with sendprop value changes.
- if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']:
- compiler.defines += ['NETWORK_VARS_ENABLED']
-
- if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2']:
- if builder.target_platform in ['linux', 'mac']:
- compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
-
- if sdk.name == 'csgo' and builder.target_platform == 'linux':
- compiler.linkflags += ['-lstdc++']
-
- for path in paths:
- compiler.cxxincludes += [os.path.join(sdk.path, *path)]
-
- if builder.target_platform == 'linux':
- if sdk.name == 'episode1':
- lib_folder = os.path.join(sdk.path, 'linux_sdk')
- elif sdk.name in ['sdk2013', 'bms']:
- lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
- else:
- lib_folder = os.path.join(sdk.path, 'lib', 'linux')
- elif builder.target_platform == 'mac':
- if sdk.name in ['sdk2013', 'bms']:
- lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
- else:
- lib_folder = os.path.join(sdk.path, 'lib', 'mac')
-
- if builder.target_platform in ['linux', 'mac']:
- if sdk.name in ['sdk2013', 'bms']:
- compiler.postlink += [
- compiler.Dep(os.path.join(lib_folder, 'tier1.a')),
- compiler.Dep(os.path.join(lib_folder, 'mathlib.a'))
- ]
- else:
- compiler.postlink += [
- compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a')),
- compiler.Dep(os.path.join(lib_folder, 'mathlib_i486.a'))
- ]
-
- if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']:
- compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
-
- dynamic_libs = []
- if builder.target_platform == 'linux':
- if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']:
- dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
- elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo']:
- dynamic_libs = ['libtier0.so', 'libvstdlib.so']
- else:
- dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
- elif builder.target_platform == 'mac':
- compiler.linkflags.append('-liconv')
- dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
- elif builder.target_platform == 'windows':
- libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
- if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'csgo']:
- libs.append('interfaces')
- for lib in libs:
- lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
- compiler.linkflags.append(compiler.Dep(lib_path))
-
- for library in dynamic_libs:
- source_path = os.path.join(lib_folder, library)
- output_path = os.path.join(binary.localFolder, library)
-
- def make_linker(source_path, output_path):
- def link(context, binary):
- cmd_node, (output,) = context.AddSymlink(source_path, output_path)
- return output
- return link
-
- linker = make_linker(source_path, output_path)
- compiler.postlink.append(compiler.Dep(library, linker))
-
- return binary
-
- def HL2Library(self, context, name, sdk):
- binary = context.compiler.Library(name)
- self.ConfigureForExtension(context, binary.compiler)
- return self.ConfigureForHL2(binary, sdk)
-
- def HL2Project(self, context, name):
- project = context.compiler.LibraryProject(name)
- self.ConfigureForExtension(context, project.compiler)
- return project
-
- def HL2Config(self, project, name, sdk):
- binary = project.Configure(name, '{0} - {1}'.format(self.tag, sdk.name))
- return self.ConfigureForHL2(binary, sdk)
-
-Extension = ExtensionConfig()
-Extension.detectSDKs()
-Extension.configure()
-
-# Add additional buildscripts here
-BuildScripts = [
- 'AMBuilder',
-]
-
-if builder.backend == 'amb2':
- BuildScripts += [
- 'PackageScript',
- ]
-
-builder.RunBuildScripts(BuildScripts, { 'Extension': Extension})
diff --git a/AMBuilder b/AMBuilder
deleted file mode 100644
index 18f15eb..0000000
--- a/AMBuilder
+++ /dev/null
@@ -1,37 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
-import os, sys
-
-projectName = 'TransmitManager'
-
-# smsdk_ext.cpp will be automatically added later
-sourceFiles = [
- 'extension.cpp',
-]
-
-###############
-# Make sure to edit PackageScript, which copies your files to their appropriate locations
-# Simple extensions do not need to modify past this point.
-
-project = Extension.HL2Project(builder, projectName + '.ext')
-
-if os.path.isfile(os.path.join(builder.currentSourcePath, 'sdk', 'smsdk_ext.cpp')):
- # Use the copy included in the project
- project.sources += [os.path.join('sdk', 'smsdk_ext.cpp')]
-else:
- # Use the copy included with SM 1.6 and newer
- project.sources += [os.path.join(Extension.sm_root, 'public', 'smsdk_ext.cpp')]
-
-project.sources += sourceFiles
-
-for sdk_name in Extension.sdks:
- sdk = Extension.sdks[sdk_name]
-
- binary = Extension.HL2Config(project, projectName + '.ext.' + sdk.ext, sdk)
-
- if sys.platform == 'win32':
- binary.compiler.postlink += [ 'legacy_stdio_definitions.lib' ]
- elif sys.platform == 'linux' or sys.platform == 'linux2':
- binary.compiler.cxxflags += [ '-std=c++14' ]
- binary.compiler.cxxflags += [ '-include', 'mathlib/mathlib.h' ]
-
-Extension.extensions = builder.Add(project)
diff --git a/PackageScript b/PackageScript
deleted file mode 100644
index d72b4da..0000000
--- a/PackageScript
+++ /dev/null
@@ -1,38 +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',
- #'addons/sourcemod/configs',
-]
-
-# 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)
-
-# 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)
- builder.AddCopy(source_path, dest_entry)
-
-# Include files
-CopyFiles('.', 'addons/sourcemod/scripting/include',
- [ 'TransmitManager.inc' ]
-)
-
-# Copy binaries.
-for cxx_task in Extension.extensions:
- builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])
diff --git a/README.md b/README.md
index 5f6a394..254f273 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
# sm-ext-TransmitManager
-Easy hook for entity transmit.
\ No newline at end of file
+
+Easy hook for entity transmit
diff --git a/configure.py b/configure.py
deleted file mode 100644
index 57910e8..0000000
--- a/configure.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et:
-import sys
-from ambuild2 import run
-
-# Simple extensions do not need to modify this file.
-
-builder = run.PrepareBuild(sourcePath = sys.path[0])
-
-builder.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
- help='Root search folder for HL2SDKs')
-builder.options.add_option('--mms-path', type=str, dest='mms_path', default=None,
- help='Path to Metamod:Source')
-builder.options.add_option('--sm-path', type=str, dest='sm_path', default=None,
- help='Path to SourceMod')
-builder.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
- help='Enable debugging symbols')
-builder.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
- help='Enable optimization')
-builder.options.add_option('-s', '--sdks', default='all', dest='sdks',
- help='Build against specified SDKs; valid args are "all", "present", or '
- 'comma-delimited list of engine names (default: %default)')
-
-builder.Configure()
diff --git a/msvc15/TransmitManager.sln b/msvc15/TransmitManager.sln
deleted file mode 100644
index 3fcf2e9..0000000
--- a/msvc15/TransmitManager.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TransmitManager", "TransmitManager.vcxproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.ActiveCfg = Release|Win32
- {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {3FB0701A-9C7D-4565-9CA7-AF56D21B7D4F}
- EndGlobalSection
-EndGlobal
diff --git a/msvc15/TransmitManager.vcxproj b/msvc15/TransmitManager.vcxproj
deleted file mode 100644
index c01fa79..0000000
--- a/msvc15/TransmitManager.vcxproj
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
-
- {B3E797CF-4E77-4C9D-B8A8-7589B6902206}
- TransmitManager
- Win32Proj
- 10.0
- TransmitManager
-
-
-
- DynamicLibrary
- MultiByte
- true
- v143
-
-
- v143
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- false
- AllRules.ruleset
-
-
- TransmitManager.ext.2.csgo
-
-
-
- Speed
- ..;$(METAMOD)\core;$(METAMOD)\core\sourcehook;$(SOURCEMOD)\core;$(SOURCEMOD)\public;$(SOURCEMOD)\public\amtl\amtl;$(SOURCEMOD)\public\amtl;$(SOURCEMOD)\sourcepawn\include;$(SOURCEMOD)\public\extensions;$(HL2SDK-CSGO)\game\shared;$(HL2SDK-CSGO)\public;$(HL2SDK-CSGO)\public\tier0;$(HL2SDK-CSGO)\public\tier1;$(HL2SDK-CSGO)\public\engine;$(HL2SDK-CSGO)\public\vstdlib;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;_CRT_NONSTDC_NO_DEPRECATE;SOURCE_ENGINE=12;COMPILER_MSVC;COMPILER_MSVC32;%(PreprocessorDefinitions)
- MultiThreaded
- NotSet
- false
-
-
- Level3
- ProgramDatabase
- /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_CSS=6 /D SE_ORANGEBOXVALVE=7 /D SE_LEFT4DEAD=8 /D SE_LEFT4DEAD2=9 /D SE_ALIENSWARM=10 /D SE_PORTAL2=11 /D SE_CSGO=12
-
-
-
-
- DebugFull
- Windows
- true
- true
- false
-
-
- MachineX86
- tier0.lib;tier1.lib;vstdlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;interfaces.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)
- $(HL2SDK-CSGO)\lib\public
-
-
-
-
- DebugFull
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/msvc15/TransmitManager.vcxproj.filters b/msvc15/TransmitManager.vcxproj.filters
deleted file mode 100644
index 3060f7b..0000000
--- a/msvc15/TransmitManager.vcxproj.filters
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
-
-
- {31958233-BB2D-4e41-A8F9-CE8A4684F436}
-
-
-
-
- Source Files
-
-
- SourceMod SDK
-
-
-
-
- Header Files
-
-
- SourceMod SDK
-
-
- SourceMod SDK
-
-
-
\ No newline at end of file
diff --git a/TransmitManager.inc b/package/addons/sourcemod/scripting/include/TransmitManager.inc
similarity index 100%
rename from TransmitManager.inc
rename to package/addons/sourcemod/scripting/include/TransmitManager.inc
diff --git a/product.version b/product.version
new file mode 100644
index 0000000..524cb55
--- /dev/null
+++ b/product.version
@@ -0,0 +1 @@
+1.1.1
diff --git a/sm-ext-common b/sm-ext-common
new file mode 160000
index 0000000..2adde8c
--- /dev/null
+++ b/sm-ext-common
@@ -0,0 +1 @@
+Subproject commit 2adde8cc6fdb3e32beee27349af1beb1769a5872
diff --git a/src/AMBuilder b/src/AMBuilder
new file mode 100644
index 0000000..b25811c
--- /dev/null
+++ b/src/AMBuilder
@@ -0,0 +1,28 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os
+
+projectName = 'TransmitManager'
+
+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)
+
+ if cxx.target.platform in ['windows']:
+ binary.compiler.postlink += [ 'legacy_stdio_definitions.lib' ]
+
+Extension.extensions += builder.Add(project)
diff --git a/extension.cpp b/src/extension.cpp
similarity index 100%
rename from extension.cpp
rename to src/extension.cpp
diff --git a/extension.h b/src/extension.h
similarity index 100%
rename from extension.h
rename to src/extension.h
diff --git a/smsdk_config.h b/src/smsdk_config.h
similarity index 89%
rename from smsdk_config.h
rename to src/smsdk_config.h
index 27ba6df..f506b73 100644
--- a/smsdk_config.h
+++ b/src/smsdk_config.h
@@ -1,9 +1,11 @@
#ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
#define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_
+#include "version.h"
+
#define SMEXT_CONF_NAME "Transmit Manager"
-#define SMEXT_CONF_DESCRIPTION ""
-#define SMEXT_CONF_VERSION "1.1"
+#define SMEXT_CONF_DESCRIPTION "Easy hook for entity transmit"
+#define SMEXT_CONF_VERSION SM_FULL_VERSION
#define SMEXT_CONF_AUTHOR "Kyle \"Kxnrl\" Frankiss"
#define SMEXT_CONF_URL "https://www.kxnrl.com"
#define SMEXT_CONF_LOGTAG "TransmitManager"