From 9fdde6bd16a2cd053d05ea6aae17056608db949c Mon Sep 17 00:00:00 2001 From: Kyle Date: Fri, 8 Oct 2021 21:26:36 +0800 Subject: [PATCH] update build scripts --- AMBuildScript | 2 +- build.bat | 6 +++--- build.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 291cce9..1538dcb 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -413,7 +413,7 @@ class ExtensionConfig(object): return link linker = make_linker(source_path, output_path) - compiler.linkflags[0:0] = [compiler.Dep(library, linker)] + compiler.postlink.append(compiler.Dep(library, linker)) return binary diff --git a/build.bat b/build.bat index 7c868b6..0331f60 100644 --- a/build.bat +++ b/build.bat @@ -8,13 +8,13 @@ if "%VSCMD_VER%"=="" ( call %VCVARSALL% x86 ) -git clone https://github.com/alliedmodders/metamod-source --branch "%BRANCH%" --single-branch "%EXT_DIR%/mmsource-%BRANCH%" +git clone https://github.com/alliedmodders/metamod-source --branch "%MMBRANCH%" --single-branch "%EXT_DIR%/mmsource-%MMBRANCH%" git clone https://github.com/alliedmodders/hl2sdk --branch csgo --single-branch "%EXT_DIR%/hl2sdk-csgo" -git clone https://github.com/alliedmodders/sourcemod --recursive --branch "%BRANCH%" --single-branch "%EXT_DIR%/sourcemod-%BRANCH%" +git clone https://github.com/alliedmodders/sourcemod --recursive --branch "%SMBRANCH%" --single-branch "%EXT_DIR%/sourcemod-%SMBRANCH%" mkdir "%EXT_DIR%/build" pushd "%EXT_DIR%/build" -python "%EXT_DIR%/configure.py" --enable-optimize --mms-path "%EXT_DIR%/mmsource-%BRANCH%" --sm-path "%EXT_DIR%/sourcemod-%BRANCH%" --hl2sdk-root "%EXT_DIR%" -s csgo || goto error +python "%EXT_DIR%/configure.py" --enable-optimize --mms-path "%EXT_DIR%/mmsource-%MMBRANCH%" --sm-path "%EXT_DIR%/sourcemod-%SMBRANCH%" --hl2sdk-root "%EXT_DIR%" -s csgo || goto error ambuild || goto error popd diff --git a/build.sh b/build.sh index 0379ed1..4d47b7b 100644 --- a/build.sh +++ b/build.sh @@ -4,13 +4,13 @@ set -e EXT_DIR=$(pwd) -git clone https://github.com/alliedmodders/metamod-source --branch "$BRANCH" --single-branch "$EXT_DIR/mmsource-$BRANCH" +git clone https://github.com/alliedmodders/metamod-source --branch "$MMBRANCH" --single-branch "$EXT_DIR/mmsource-$MMBRANCH" git clone https://github.com/alliedmodders/hl2sdk --branch csgo --single-branch "$EXT_DIR/hl2sdk-csgo" -git clone https://github.com/alliedmodders/sourcemod --recursive --branch "$BRANCH" --single-branch "$EXT_DIR/sourcemod-$BRANCH" +git clone https://github.com/alliedmodders/sourcemod --recursive --branch "$SMBRANCH" --single-branch "$EXT_DIR/sourcemod-$SMBRANCH" mkdir -p "$EXT_DIR/build" pushd "$EXT_DIR/build" -python3 "$EXT_DIR/configure.py" --enable-optimize --mms-path "$EXT_DIR/mmsource-$BRANCH" --sm-path "$EXT_DIR/sourcemod-$BRANCH" --hl2sdk-root "$EXT_DIR" -s csgo +python3 "$EXT_DIR/configure.py" --enable-optimize --mms-path "$EXT_DIR/mmsource-$MMBRANCH" --sm-path "$EXT_DIR/sourcemod-$SMBRANCH" --hl2sdk-root "$EXT_DIR" -s csgo ambuild # might be optional