Run on windows-2022-large

.github/workflows/build.yaml

@@ -10,14 +10,14 @@ jobs:
   build:
     strategy:
       matrix:
-        runner: [windows_2022_public]
+        runner: [windows-2022-large]
         configuration: [ReleaseOS]
         addrsize: [64]
         include:
-          - runner: windows_2022_public
+          - runner: windows-2022-large
             configuration: ReleaseOS
             addrsize: 32
-    runs-on: ${{ matrix.runner }}
+    runs-on: [${{ matrix.runner }}]
     env:
       AUTOBUILD_CONFIGURATION: ${{ matrix.configuration }}
       AUTOBUILD_ADDRSIZE: ${{ matrix.addrsize }}
@@ -43,7 +43,7 @@ jobs:
         id: cache-installables
         with:
           path: .autobuild-installables
-          key: ${{ matrix.os }}-${{ matrix.addrsize }}-${{ matrix.configuration }}-${{ hashFiles('autobuild.xml') }} 
+          key: ${{ matrix.runner }}-${{ matrix.addrsize }}-${{ matrix.configuration }}-${{ hashFiles('autobuild.xml') }}
 
       - name: Install windows dependencies
         if: runner.os == 'Windows'

indra/cmake/00-Common.cmake

@@ -55,15 +55,6 @@ if (WINDOWS)
   # http://www.cmake.org/pipermail/cmake/2009-September/032143.html
   string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 
-  # Without PreferredToolArchitecture=x64, as of 2020-06-26 the 32-bit
-  # compiler on our TeamCity build hosts has started running out of virtual
-  # memory for the precompiled header file.
-  # CP changed to only append the flag for 32bit builds - on 64bit builds,
-  # locally at least, the build output is spammed with 1000s of 'D9002'
-  # warnings about this switch being ignored.
-  if( ADDRESS_SIZE EQUAL 32 )
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")  
-  endif()
   # zlib has assembly-language object files incompatible with SAFESEH
   add_link_options(/LARGEADDRESSAWARE
           /SAFESEH:NO