Merged in vgpowerlord/dhooks2/ambuildscript-1.8 (pull request #5)

Update AMBuildScript to build against SourceMod 1.8 and 1.7 both.
This commit is contained in:
Ruben Gonzalez 2015-12-24 08:41:26 -05:00
commit 608a6681d1

View File

@ -232,6 +232,10 @@ class DHooksConfig(object):
os.path.join(self.sm_root, 'public', 'amtl'), os.path.join(self.sm_root, 'public', 'amtl'),
os.path.join(self.sm_root, 'public', 'jit'), os.path.join(self.sm_root, 'public', 'jit'),
os.path.join(self.sm_root, 'public', 'jit', 'x86'), os.path.join(self.sm_root, 'public', 'jit', 'x86'),
os.path.join(self.sm_root, 'sourcepawn', 'include'),
os.path.join(self.sm_root, 'sourcepawn', 'vm'),
os.path.join(self.sm_root, 'sourcepawn', 'vm', 'x86'),
os.path.join(self.sm_root, 'public', 'amtl', 'include'),
] ]
@ -249,7 +253,13 @@ program.sources += [
'vhook.cpp', 'vhook.cpp',
'sdk/smsdk_ext.cpp', 'sdk/smsdk_ext.cpp',
] ]
program.sources += [os.path.join(DHooks.sm_root, 'public', 'jit', 'x86', "assembler-x86.cpp"),]
if os.path.isfile(os.path.join(DHooks.sm_root, 'sourcepawn', 'vm', 'x86', 'assembler-x86.cpp')):
program.sources += [os.path.join(DHooks.sm_root, 'sourcepawn', 'vm', 'x86', 'assembler-x86.cpp'),]
elif os.path.isfile(os.path.join(DHooks.sm_root, 'public', 'jit', 'x86', 'assembler-x86.cpp')):
program.sources += [os.path.join(DHooks.sm_root, 'public', 'jit', 'x86', 'assembler-x86.cpp'),]
else:
raise Exception('Could not find assembler-x86.cpp. Did you checkout SourceMod\'s submodules?')
DHooks.task = builder.Add(program) DHooks.task = builder.Add(program)