Skip to content

Commit

Permalink
Try VS2019 GHA build
Browse files Browse the repository at this point in the history
  • Loading branch information
z33ky committed Nov 14, 2021
1 parent 2be9a4f commit 91eef57
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ jobs:
- uses: actions/checkout@v2

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v1
with:
vs-version: '12.0.40629.0'
uses: microsoft/[email protected]

- name: Enable VS2019
working-directory: sp/src/vpc_scripts
shell: bash
run: sed -i 's/^\($Conditional[ ]\+VS2019[ ]\+\).*/\1"1"/' default.vgc

- name: Create projectfiles
working-directory: sp/src
Expand All @@ -37,8 +40,13 @@ jobs:
# Add additional options to the MSBuild command line here (like platform or verbosity level).
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
shell: cmd
# call refreshenv
run: |
msbuild -m -p:Configuration=${{env.BUILD_CONFIGURATION}} mathlib\mathlib.vcxproj
msbuild -m -p:Configuration=${{env.BUILD_CONFIGURATION}} raytrace\raytrace.vcxproj
msbuild -m -p:Configuration=${{env.BUILD_CONFIGURATION}} responserules\runtime\responserules.vcxproj
msbuild -m -p:Configuration=${{env.BUILD_CONFIGURATION}} tier1\tier1.vcxproj
msbuild -m -p:Configuration=${{env.BUILD_CONFIGURATION}} vgui2\vgui_controls\vgui_controls.vcxproj
msbuild -m -p:Configuration=${{env.BUILD_CONFIGURATION}} vscript\vscript.vcxproj
msbuild -m -p:Configuration=${{env.BUILD_CONFIGURATION}} game\client\client_ntks.vcxproj
msbuild -m -p:Configuration=${{env.BUILD_CONFIGURATION}} game\server\server_ntks.vcxproj
Expand Down
3 changes: 3 additions & 0 deletions sp/src/public/tier0/memoverride.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@ ALLOC_CALL void * __cdecl _recalloc ( void * memblock, size_t count, size_t size
}

size_t _msize_base( void *pMem )
#if _MSC_VER >= 1925 //VS2019+
throw()
#endif
{
return g_pMemAlloc->GetSize(pMem);
}
Expand Down

0 comments on commit 91eef57

Please sign in to comment.