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

Fix merge conflict oopsie

Browse Source
This commit is contained in:
Nick Hastings 2024-08-03 12:23:18 -04:00
parent 4158430180
commit 7e09821da9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/AMBuilder
View File

@ -41,7 +41,7 @@ for sdk_target in MMS.sdk_targets:
])] ])]
if cxx.target.arch == 'x86': if cxx.target.arch == 'x86':
binary.sources += ['sourcehook/sourcehook_hookmangen.cpp'] binary.sources += ['sourcehook/sourcehook_hookmangen_x86.cpp']
elif binary.compiler.target.arch == 'x86_64' and binary.compiler.target.platform != 'linux': elif binary.compiler.target.arch == 'x86_64' and binary.compiler.target.platform != 'linux':
binary.sources += ['sourcehook/sourcehook_hookmangen_x86_64.cpp'] binary.sources += ['sourcehook/sourcehook_hookmangen_x86_64.cpp']
nodes = builder.Add(binary) nodes = builder.Add(binary)