Merge branch 'master' into mobile_hacks

.github/workflows/.github.yml

@@ -72,7 +72,7 @@ jobs:
       if: startsWith(matrix.os, 'windows')
       run: |
         cmake -G "Visual Studio 15 2017" -B build -DGOLDSOURCE_SUPPORT=ON -DCMAKE_INSTALL_PREFIX="dist"
-        msbuild build/INSTALL.vcxproj
+        msbuild -verbosity:normal /property:Configuration=Release build/INSTALL.vcxproj
 
     - name: Extract branch name
       shell: bash

CMakeLists.txt

@@ -22,6 +22,10 @@
 
 cmake_minimum_required(VERSION 2.8.12)
 
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.15.0")
+    cmake_policy(SET CMP0091 NEW)
+endif()
+
 # Install custom module path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 

README.md

@@ -37,8 +37,6 @@ These scripts also can be ran via wine:
 
 The libraries built this way are always GoldSource compatible.
 
-There're dsp projects for Visual Studio 6 in `cl_dll` and `dlls` directories, but we don't keep them up-to-date. You're free to adapt them for yourself and try to import into the newer Visual Studio versions.
-
 #### Using mingw
 
 TODO

appveyor.yml

@@ -16,6 +16,7 @@ build:
 
 configuration:
   - Debug
+  - Release
 
 before_build:
   - git submodule update --init --recursive

cl_dll/CMakeLists.txt

@@ -147,6 +147,10 @@ if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 		PREFIX "")
 endif()
 
+if(MSVC)
+	set_property(TARGET ${CLDLL_LIBRARY} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+endif()
+
 install( TARGETS ${CLDLL_LIBRARY}
 	DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/"
 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE

dlls/CMakeLists.txt

@@ -179,6 +179,10 @@ if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 		PREFIX "")
 endif()
 
+if(MSVC)
+	set_property(TARGET ${SVDLL_LIBRARY} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+endif()
+
 install( TARGETS ${SVDLL_LIBRARY}
 	DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/"
 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE