UNLOZE/sm-ext-accelerator-2023
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update misleading SM version number

Browse Source
This commit is contained in:
Asher Baker 2017-09-13 10:23:32 +00:00
parent 06cc61eee1
commit 8056b5c1a1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,7 +8,7 @@ compiler:
- clang - clang
before_script: before_script:
- cd .. - cd ..
- git clone --depth=1 --branch=1.7-dev https://github.com/alliedmodders/sourcemod sourcemod-1.5 - git clone --depth=1 --branch=1.7-dev https://github.com/alliedmodders/sourcemod sourcemod-1.7
- git clone --depth=1 --branch=master https://github.com/alliedmodders/ambuild - git clone --depth=1 --branch=master https://github.com/alliedmodders/ambuild
- cd ambuild && python setup.py install --user - cd ambuild && python setup.py install --user
- cd $TRAVIS_BUILD_DIR - cd $TRAVIS_BUILD_DIR

2
AMBuildScript
View File

@ -32,7 +32,7 @@ class SM:
self.compiler.DetectAll(AMBuild) self.compiler.DetectAll(AMBuild)
#Detect variables #Detect variables
envvars = { 'SOURCEMOD15': 'sourcemod-1.5' } envvars = { 'SOURCEMOD': 'sourcemod-1.7' }
# Finds if a dict with `key` set to `value` is present on the dict of dicts `dictionary` # Finds if a dict with `key` set to `value` is present on the dict of dicts `dictionary`
def findDictByKey(dictionary, key, value): def findDictByKey(dictionary, key, value):

2
appveyor.yml
View File

@ -4,7 +4,7 @@ environment:
GYP_MSVS_VERSION: '2013' GYP_MSVS_VERSION: '2013'
install: install:
- cd .. - cd ..
- git clone --depth=1 --branch=1.7-dev https://github.com/alliedmodders/sourcemod sourcemod-1.5 - git clone --depth=1 --branch=1.7-dev https://github.com/alliedmodders/sourcemod sourcemod-1.7
- git clone --depth=1 --branch=master https://github.com/alliedmodders/ambuild - git clone --depth=1 --branch=master https://github.com/alliedmodders/ambuild
- cd ambuild - cd ambuild
- C:\python27\python.exe setup.py install - C:\python27\python.exe setup.py install

8
extension/AMBuilder
View File

@ -45,9 +45,9 @@ def BuildExtension():
compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'extension')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'extension'))
compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD'], 'public'))
compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public', 'extensions')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD'], 'public', 'extensions'))
compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public', 'sourcepawn')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD'], 'public', 'sourcepawn'))
compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src'))
@ -64,7 +64,7 @@ def BuildExtension():
'MemoryDownloader.cpp', 'MemoryDownloader.cpp',
]) ])
binary.AddSourceFiles(AMBuild.cache['SOURCEMOD15'], ['public/smsdk_ext.cpp']) binary.AddSourceFiles(AMBuild.cache['SOURCEMOD'], ['public/smsdk_ext.cpp'])
if AMBuild.target['platform'] in ['linux']: if AMBuild.target['platform'] in ['linux']:
link = os.path.join(AMBuild.outputFolder, extension.workFolder, 'libbreakpad_client.a') link = os.path.join(AMBuild.outputFolder, extension.workFolder, 'libbreakpad_client.a')