UNLOZE/sourcemod
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert AMBuild scripts to use hl2sdk-manifests (#2096)

Browse Source 
* Add hl2sdk-manifests submodule

* Update AMBuild scripts to utilize hl2sdk-manifests

* Add build*/ to .gitignore
This commit is contained in:
Nicholas Hastings
2023-12-18 23:15:44 +00:00
committed by GitHub
parent 544204654d
commit b42e5ac922
9 changed files with 126 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/cstrike/AMBuilder
+8 -8
View File
@@ -29,31 +29,31 @@ for sdk_name in ['css', 'csgo']:
project.sources += ['rulesfix.cpp']
for cxx in builder.targets:
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
continue
cxx.defines += ['HAVE_STRING_H']
binary = SM.HL2ExtConfig(project, builder, cxx, 'game.cstrike.ext.' + sdk.ext, sdk)
binary = SM.HL2ExtConfig(project, builder, cxx, 'game.cstrike.ext.' + sdk['extension'], sdk)
if sdk_name == 'csgo':
compiler = binary.compiler
compiler.cxxincludes += [os.path.join(sdk.path, 'public', 'steam')]
compiler.cxxincludes += [os.path.join(sdk['path'], 'public', 'steam')]
compiler.defines += ['VERSION_SAFE_STEAM_API_INTERFACES']
library_name = ''
if cxx.target.platform == 'windows':
compiler.linkflags += [os.path.join(sdk.path, 'lib', 'public', 'steam_api.lib')]
compiler.linkflags += [os.path.join(sdk['path'], 'lib', 'public', 'steam_api.lib')]
elif cxx.target.platform == 'linux':
library_name = 'libsteam_api.so'
if cxx.target.arch == 'x86_64':
source_path = os.path.join(sdk.path, 'lib', 'linux64')
source_path = os.path.join(sdk['path'], 'lib', 'linux64')
else:
source_path = os.path.join(sdk.path, 'lib', 'linux')
source_path = os.path.join(sdk['path'], 'lib', 'linux')
elif cxx.target.platform == 'mac':
library_name = 'libsteam_api.dylib'
if cxx.target.arch == 'x86_64':
source_path = os.path.join(sdk.path, 'lib', 'osx64')
source_path = os.path.join(sdk['path'], 'lib', 'osx64')
else:
source_path = os.path.join(sdk.path, 'lib', 'mac')
source_path = os.path.join(sdk['path'], 'lib', 'mac')
if library_name:
source_path = os.path.join(source_path, library_name)
extensions/sdkhooks/AMBuilder
+2 -5
View File
@@ -14,13 +14,10 @@ for sdk_name in SM.sdks:
sdk = SM.sdks[sdk_name]
for cxx in builder.targets:
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
continue
binary = SM.HL2ExtConfig(project, builder, cxx, 'sdkhooks.ext.' + sdk.ext, sdk)
binary.compiler.cxxincludes += [
os.path.join(sdk.path, 'game', 'shared')
]
binary = SM.HL2ExtConfig(project, builder, cxx, 'sdkhooks.ext.' + sdk['extension'], sdk)
if binary.compiler.behavior == 'gcc':
binary.compiler.cxxflags += ['-Wno-invalid-offsetof']
extensions/sdktools/AMBuilder
+5 -6
View File
@@ -37,22 +37,21 @@ project.sources += [
for sdk_name in SM.sdks:
sdk = SM.sdks[sdk_name]
if sdk.name in ['mock']:
if sdk['name'] in ['mock']:
continue
for cxx in builder.targets:
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
continue
binary = SM.HL2ExtConfig(project, builder, cxx, 'sdktools.ext.' + sdk.ext, sdk)
binary = SM.HL2ExtConfig(project, builder, cxx, 'sdktools.ext.' + sdk['extension'], sdk)
binary.compiler.cxxincludes += [
os.path.join(sdk.path, 'game', 'shared'),
os.path.join(builder.sourcePath, 'public', 'jit'),
os.path.join(builder.sourcePath, 'public', 'jit', 'x86'),
]
binary.compiler.defines += ['HAVE_STRING_H'];
binary.compiler.defines += ['HAVE_STRING_H']
if sdk.name != 'episode1':
if sdk['name'] != 'episode1':
binary.compiler.defines += ['HOOKING_ENABLED']
if binary.compiler.behavior == 'gcc':
extensions/tf2/AMBuilder
+3 -3
View File
@@ -5,9 +5,9 @@ if 'tf2' in SM.sdks:
sdk = SM.sdks['tf2']
for cxx in builder.targets:
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
continue
binary = SM.HL2Library(builder, cxx, 'game.tf2.ext.' + sdk.ext, sdk)
binary = SM.HL2Library(builder, cxx, 'game.tf2.ext.' + sdk['extension'], sdk)
binary.sources += [
'extension.cpp',
'natives.cpp',
@@ -28,5 +28,5 @@ if 'tf2' in SM.sdks:
'../../public/libudis86/syn.c',
'../../public/libudis86/udis86.c',
]
binary.compiler.defines += ['HAVE_STRING_H'];
binary.compiler.defines += ['HAVE_STRING_H']
SM.extensions += [builder.Add(binary)]