UNLOZE/sm-ext-dhooks2
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update AMBuild files.

Browse Source
This commit is contained in:
Dr!fter 2016-06-26 11:00:19 -04:00
parent 15e6e81f39
commit 6d3d6118ee
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AMBuildScript
View File

@ -67,7 +67,7 @@ class DHooksConfig(object):
if builder.options.sm_path: if builder.options.sm_path:
self.sm_root = builder.options.sm_path self.sm_root = builder.options.sm_path
else: else:
self.sm_root = ResolveEnvPath('SOURCEMOD17', 'sourcemod-1.7') self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.8')
if not self.sm_root or not os.path.isdir(self.sm_root): if not self.sm_root or not os.path.isdir(self.sm_root):
raise Exception('Could not find a source copy of Sourcemod') raise Exception('Could not find a source copy of Sourcemod')
@ -235,7 +235,8 @@ class DHooksConfig(object):
os.path.join(self.sm_root, 'sourcepawn', 'include'), os.path.join(self.sm_root, 'sourcepawn', 'include'),
os.path.join(self.sm_root, 'sourcepawn', 'vm'), os.path.join(self.sm_root, 'sourcepawn', 'vm'),
os.path.join(self.sm_root, 'sourcepawn', 'vm', 'x86'), os.path.join(self.sm_root, 'sourcepawn', 'vm', 'x86'),
os.path.join(self.sm_root, 'public', 'amtl', 'include'), os.path.join(self.sm_root, 'public', 'amtl', 'include'),
os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
] ]
@ -254,6 +255,8 @@ program.sources += [
'sdk/smsdk_ext.cpp', 'sdk/smsdk_ext.cpp',
] ]
project.sources += [os.path.join(DHooks.sm_root, 'public', 'smsdk_ext.cpp')]
if os.path.isfile(os.path.join(DHooks.sm_root, 'sourcepawn', 'vm', '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'),] 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')): elif os.path.isfile(os.path.join(DHooks.sm_root, 'public', 'jit', 'x86', 'assembler-x86.cpp')):

2
buildbot/bootstrap.pl
View File

@ -19,7 +19,7 @@ our ($root) = getcwd();
#update and configure shiz #update and configure shiz
if ($^O eq "darwin") { if ($^O eq "darwin") {
$ENV{'SOURCEMOD17'} = '/Users/builds/slaves/common/sourcemod-1.7'; $ENV{'SOURCEMOD18'} = '/Users/builds/slaves/common/sourcemod-1.8';
} }
rmtree('OUTPUT'); rmtree('OUTPUT');