source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-07 02:18:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move submodule to third_party directory

Browse Source
This commit is contained in:
Kenzzer 2025-04-29 09:33:15 +00:00
parent 04c0c99db9
commit dc1bfdd379
No known key found for this signature in database
GPG Key ID: 64C3FD4332686DC1
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -5,5 +5,5 @@
path = hl2sdk-manifests path = hl2sdk-manifests
url = https://github.com/alliedmodders/hl2sdk-manifests url = https://github.com/alliedmodders/hl2sdk-manifests
[submodule "core/khook"] [submodule "core/khook"]
path = core/khook path = third_party/khook
url = https://github.com/Kenzzer/KHook url = https://github.com/Kenzzer/KHook

4
AMBuildScript
View File

@ -371,7 +371,6 @@ BuildScripts = [
] ]
if getattr(builder.options, 'enable_tests', False): if getattr(builder.options, 'enable_tests', False):
BuildScripts += [ BuildScripts += [
'core/sourcehook/test/AMBuilder',
'loader/test/AMBuilder', 'loader/test/AMBuilder',
] ]
@ -380,8 +379,7 @@ if builder.backend == 'amb2':
'support/buildbot/PackageScript', 'support/buildbot/PackageScript',
] ]
builder.Build('core/khook/AMBuilder', { 'KHook': MMS }) builder.Build(['third_party/khook/AMBuilder', 'third_party/khook/third_party/safetyhook/AMBuilder'], { 'KHook': MMS, 'SafetyHook': MMS })
builder.Build('core/khook/third_party/safetyhook/AMBuilder', { 'SafetyHook': MMS })
builder.Build(BuildScripts, { 'MMS': MMS }) builder.Build(BuildScripts, { 'MMS': MMS })
if builder.options.breakpad_dump: if builder.options.breakpad_dump:

2
core/AMBuilder
View File

@ -7,7 +7,7 @@ for sdk_target in MMS.sdk_targets:
name = 'metamod.' + sdk['extension'] name = 'metamod.' + sdk['extension']
binary = MMS.HL2Library(builder, cxx, name, sdk) binary = MMS.HL2Library(builder, cxx, name, sdk)
binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'core', 'khook', 'include')] binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'third_party', 'khook', 'include')]
binary.compiler.defines += ['KHOOK_STANDALONE'] binary.compiler.defines += ['KHOOK_STANDALONE']
for task in MMS.libkhook: for task in MMS.libkhook:

2
loader/AMBuilder
View File

@ -4,7 +4,7 @@ import os.path
def configure_library(cxx, name, linux_defines): def configure_library(cxx, name, linux_defines):
libname = name libname = name
binary = MMS.Library(cxx, libname) binary = MMS.Library(cxx, libname)
binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'core', 'khook', 'include')] binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'third_party', 'khook', 'include')]
binary.sources += [ binary.sources += [
'loader.cpp', 'loader.cpp',
'gamedll.cpp', 'gamedll.cpp',

0
core/khook → third_party/khook vendored
View File