From 8056b5c1a10b134abb3be4834447cb8f2b8f3117 Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Wed, 13 Sep 2017 10:23:32 +0000 Subject: [PATCH] Update misleading SM version number --- .travis.yml | 2 +- AMBuildScript | 2 +- appveyor.yml | 2 +- extension/AMBuilder | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb380a8..193e500 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ compiler: - clang before_script: - 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 - cd ambuild && python setup.py install --user - cd $TRAVIS_BUILD_DIR diff --git a/AMBuildScript b/AMBuildScript index b824de1..defac88 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -32,7 +32,7 @@ class SM: self.compiler.DetectAll(AMBuild) #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` def findDictByKey(dictionary, key, value): diff --git a/appveyor.yml b/appveyor.yml index ff8d252..f143344 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ environment: GYP_MSVS_VERSION: '2013' install: - 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 - cd ambuild - C:\python27\python.exe setup.py install diff --git a/extension/AMBuilder b/extension/AMBuilder index 0e02729..07ea26a 100644 --- a/extension/AMBuilder +++ b/extension/AMBuilder @@ -45,9 +45,9 @@ def BuildExtension(): 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['SOURCEMOD15'], 'public', 'extensions')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public', 'sourcepawn')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD'], 'public')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD'], 'public', 'extensions')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD'], 'public', 'sourcepawn')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src')) @@ -64,7 +64,7 @@ def BuildExtension(): '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']: link = os.path.join(AMBuild.outputFolder, extension.workFolder, 'libbreakpad_client.a')