Merge branch 'master' into 🍿

.github/workflows/ci.yml

@@ -13,24 +13,19 @@ jobs:
         include:
           - os: windows-latest
             os_short: windows
-            compiler_cc: msvc-vs2019
-          - os: windows-2016
+            compiler_cc: msvc-vs2022
+          - os: windows-2019
             os_short: windows
-            compiler_cc: msvc-vs2017
+            compiler_cc: msvc-vs2019
           - os: ubuntu-latest
             os_short: linux
             compiler_cc: clang
             compiler_cxx: clang++
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             os_short: linux
-            compiler_cc: clang-3.9
-            compiler_cxx: clang++-3.9
-            compiler_install: clang-3.9
-          - os: ubuntu-18.04
-            os_short: linux
-            compiler_cc: gcc-6
-            compiler_cxx: g++-6
-            compiler_install: 'gcc-6 g++6 g++-6-multilib'
+            compiler_cc: clang-6.0
+            compiler_cxx: clang++-6.0
+            compiler_install: clang-6.0
           - os: macos-latest
             os_short: mac
             compiler_cc: clang

AMBuildScript

@@ -46,6 +46,10 @@ Blade = {
   'windows': ['x86', 'x86_64'],
   'linux': ['x86_64']
 }
+MCV = {
+  'windows': ['x86_64'],
+  'linux': ['x86_64'],
+}
 Mock = {
   'windows': ['x86', 'x86_64'],
   'linux': ['x86', 'x86_64'],
@@ -67,7 +71,7 @@ PossibleSDKs = {
   'swarm':  SDK('HL2SDK-SWARM', '2.swarm', '17', 'ALIENSWARM', WinOnly, 'swarm'),
   'bgt':  SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
   'eye':  SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
-  'mcv': SDK('HL2SDKMCV', '2.mcv', '22', 'MCV', WinOnly, 'mcv'),
+  'mcv': SDK('HL2SDKMCV', '2.mcv', '22', 'MCV', MCV, 'mcv'),
   'csgo': SDK('HL2SDKCSGO', '2.csgo', '23', 'CSGO', CSGO, 'csgo'),
   'portal2':  SDK('HL2SDKPORTAL2', '2.portal2', '18', 'PORTAL2', [], 'portal2'),
   'blade':  SDK('HL2SDKBLADE', '2.blade', '19', 'BLADE', Blade, 'blade'),
@@ -494,7 +498,7 @@ class MMSConfig(object):
         dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
       elif compiler.target.arch == 'x86_64' and sdk.name in ['csgo', 'mock']:
         dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so']
-      elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo', 'cs2', 'dota', 'pvkii']:
+      elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo', 'cs2', 'dota', 'pvkii', 'mcv']:
         dynamic_libs = ['libtier0.so']
         if sdk.name not in ['dota', 'cs2']:
           dynamic_libs += ['libvstdlib.so']

core/sourcehook/generate/shworker/Makefile

@@ -1,4 +1,4 @@
-CPP = gcc
+CPP = clang
 
 default: shworker
 

core/sourcehook/generate/shworker/fd_hopter.cpp

@@ -70,7 +70,7 @@ expansion.
  Installation (for VC6, if you want to use .HOH as the extension instead):
  Go into the registry and change 
  HKEY_CURRENT_USER\Software\Microsoft\DevStudio\6.0\Text Editor\Tabs/Language Settings\C/C++\FileExtensions from cpp;cxx;c;h;hxx;hpp;inl;tlh;tli;rc;rc2 
- to cpp;cxx;c;h;hxx;hpp;inl;tlh;tli;rc;rc2;hoh by adding “;hoh” to the end.
+ to cpp;cxx;c;h;hxx;hpp;inl;tlh;tli;rc;rc2;hoh by adding <EFBFBD>;hoh<EFBFBD> to the end.
  Then add this as a custom build step to the main file of your project:
  hopter $(InputDir)\*.hoh $(InputDir)\*.h
 
@@ -79,6 +79,7 @@ expansion.
 #include <string>
 #include <stdarg.h>
 #include <stdio.h>
+#include <cstring>
 
 // This is a quick-n-dirty implementation of a CString replacement.
 // It promises nothing more than to provide enough functionality to get
@@ -327,7 +328,7 @@ void PrintVarArgs(FILE *fout, CString bigblock, int num) {
 	bigblock.Replace("@INVOKEARGS,", invokelist + commastr);
 	bigblock.Replace("@INVOKEARGS", invokelist);
 
-	fprintf(fout, bigblock);				
+	fputs(bigblock, fout);				
 }
 
 int action_hopter(int numargs, const char *filenamein, const char *filenameout)

core/sourcehook/generate/shworker/shworker.cpp

@@ -50,6 +50,7 @@
 #include <algorithm>
 #include <stack>
 #include <map>
+#include <cstring>
 #include "stdio.h"
 
 #ifdef __linux__

core/sourcehook/generate/sourcehook.hxx

@@ -1043,6 +1043,7 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
 	{ \
 		FD m_Deleg; \
 		CMyDelegateImpl(FD deleg) : m_Deleg(deleg) {} \
+		virtual ~CMyDelegateImpl() {} \
 		ret_type Call params_decl { return m_Deleg params_pass; } \
 		void DeleteThis() { delete this; } \
 		bool IsEqual(ISHDelegate *pOtherDeleg) { return m_Deleg == static_cast<CMyDelegateImpl*>(pOtherDeleg)->m_Deleg; } \
@@ -1054,6 +1055,7 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
 	{ \
 		FD m_Deleg; \
 		CMyDelegateImpl(FD deleg) : m_Deleg(deleg) {} \
+		virtual ~CMyDelegateImpl() {} \
 		void Call params_decl { m_Deleg params_pass; } \
 		void DeleteThis() { delete this; } \
 		bool IsEqual(ISHDelegate *pOtherDeleg) { return m_Deleg == static_cast<CMyDelegateImpl*>(pOtherDeleg)->m_Deleg; } \

core/sourcehook/sourcehook.h

@@ -1043,6 +1043,7 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
 	{ \
 		FD m_Deleg; \
 		CMyDelegateImpl(FD deleg) : m_Deleg(deleg) {} \
+		virtual ~CMyDelegateImpl() {} \
 		ret_type Call params_decl { return m_Deleg params_pass; } \
 		void DeleteThis() { delete this; } \
 		bool IsEqual(ISHDelegate *pOtherDeleg) { return m_Deleg == static_cast<CMyDelegateImpl*>(pOtherDeleg)->m_Deleg; } \
@@ -1054,6 +1055,7 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
 	{ \
 		FD m_Deleg; \
 		CMyDelegateImpl(FD deleg) : m_Deleg(deleg) {} \
+		virtual ~CMyDelegateImpl() {} \
 		void Call params_decl { m_Deleg params_pass; } \
 		void DeleteThis() { delete this; } \
 		bool IsEqual(ISHDelegate *pOtherDeleg) { return m_Deleg == static_cast<CMyDelegateImpl*>(pOtherDeleg)->m_Deleg; } \

support/buildbot/bootstrap.pl

@@ -13,8 +13,14 @@ use FindBin;
 use lib $FindBin::Bin;
 require 'helpers.pm';
 
+#Go back to tree root.
+my ($result);
+chdir(Build::PathFormat('../..'));
+$result = `git submodule update --init --recursive`;
+print "$result\n";
+
 #Go back above build dir
-chdir(Build::PathFormat('../../..'));
+chdir(Build::PathFormat('..'));
 
 #Get the source path.
 our ($root) = getcwd();