From 13a3757026d09adf800a0f23b1cc5bc79b173aea Mon Sep 17 00:00:00 2001 From: Accelerator Date: Mon, 6 May 2024 08:39:03 +0300 Subject: [PATCH] Update workflow --- .github/workflows/build.yml | 18 +----------------- AMBuildScript | 2 +- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ed88f7..c5a1e8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,23 +65,6 @@ jobs: echo "CC=clang" >> $GITHUB_ENV echo "CXX=clang++" >> $GITHUB_ENV - - name: Add msbuild to PATH (Windows) - if: startsWith(runner.os, 'Windows') - uses: microsoft/setup-msbuild@v2 - - - name: Install (Windows) - if: startsWith(runner.os, 'Windows') - shell: cmd - run: | - :: See https://github.com/microsoft/vswhere/wiki/Find-VC - for /f "usebackq delims=*" %%i in (`vswhere -latest -property installationPath`) do ( - call "%%i"\Common7\Tools\vsdevcmd.bat -arch=x86 -host_arch=x64 - ) - :: Loop over all environment variables and make them global. - for /f "delims== tokens=1,2" %%a in ('set') do ( - echo>>"%GITHUB_ENV%" %%a=%%b - ) - - name: Checking out SourceMod uses: actions/checkout@v4 with: @@ -148,6 +131,7 @@ jobs: path: src - name: Compiling ${{ github.event.repository.name }} files + shell: bash working-directory: src run: | mkdir build diff --git a/AMBuildScript b/AMBuildScript index 916790f..a56a7b0 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -484,7 +484,7 @@ class ExtensionConfig(object): if compiler.target.platform == 'linux': if sdk.name in ['csgo', 'blade']: - compiler.linkflags.remove('-static-libstdc++') + #compiler.linkflags.remove('-static-libstdc++') compiler.defines += ['_GLIBCXX_USE_CXX11_ABI=0'] for path in paths: