From 178640b3e7540166bb70cd244c97951959e555ac Mon Sep 17 00:00:00 2001 From: Accelerator Date: Thu, 23 Jul 2026 17:37:11 +0300 Subject: [PATCH] Update build scripts --- AMBuildScript | 15 +++++++++------ AMBuilder | 2 +- configure.py | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 2ecdbbb..61b201d 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -56,6 +56,7 @@ class ExtensionConfig(object): self.sdks = {} self.sdk_targets = [] self.binaries = [] + self.extensions = [] self.generated_headers = None self.mms_root = None self.all_targets = [] @@ -111,9 +112,11 @@ class ExtensionConfig(object): if builder.options.mms_path: self.mms_root = builder.options.mms_path else: - self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10') + self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12') if not self.mms_root: self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source') + 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') @@ -230,6 +233,9 @@ class ExtensionConfig(object): '-Wno-tautological-overlap-compare', ] + if cxx.version >= 'clang-21.0': + cxx.cflags += ['-Wno-uninitialized-const-pointer'] + if have_gcc: cxx.cflags += ['-mfpmath=sse'] cxx.cflags += ['-Wno-maybe-uninitialized'] @@ -297,9 +303,9 @@ class ExtensionConfig(object): def configure_mac(self, cxx): cxx.defines += ['OSX', '_OSX', 'POSIX', 'KE_ABSOLUTELY_NO_STL'] - cxx.cflags += ['-mmacosx-version-min=10.7'] + cxx.cflags += ['-mmacosx-version-min=10.15'] cxx.linkflags += [ - '-mmacosx-version-min=10.7', + '-mmacosx-version-min=10.15', '-stdlib=libc++', '-lc++', ] @@ -371,9 +377,6 @@ class ExtensionConfig(object): SdkHelpers.configureCxx(context, binary, sdk) - if '-Wno-nontrivial-memcall' in compiler.cflags: - compiler.cflags.remove('-Wno-nontrivial-memcall') - return binary def HL2Library(self, context, compiler, name, sdk): diff --git a/AMBuilder b/AMBuilder index 6ff89c9..b30ffc3 100644 --- a/AMBuilder +++ b/AMBuilder @@ -18,4 +18,4 @@ for sdk_name in Extension.sdks: binary = Extension.HL2Config(project, builder, cxx, 'l4dtoolz_mm', sdk) -Extension.extensions = builder.Add(project) +Extension.extensions += builder.Add(project) diff --git a/configure.py b/configure.py index abdf43e..9e1e720 100644 --- a/configure.py +++ b/configure.py @@ -29,7 +29,7 @@ parser.options.add_argument('--enable-debug', action='store_const', const='1', d 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='present', dest='sdks', +parser.options.add_argument('-s', '--sdks', default='l4d2', dest='sdks', help='Build against specified SDKs; valid args are "none", "all", "present",' ' or comma-delimited list of engine names') parser.options.add_argument('--targets', type=str, dest='targets', default=None,