Conformance fixes

OpenXcom · Aug 22, 2023 · 7509b7f · 7509b7f
1 parent 0d035b2
commit 7509b7f
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -54,10 +54,12 @@ jobs:
         uses: microsoft/setup-msbuild@v1.1.3
 
       - name: Compile source (x86 & x64)
+        env:
+          VC_FLAGS: /v:minimal /m /p:BuildInParallel=true /p:PreferredToolArchitecture=x64 /p:Configuration=Release /p:PlatformToolset=v141_xp /p:ConformanceMode=false
         run: |
           cd src
-          msbuild OpenXcom.2010.sln /m /p:BuildInParallel=true /p:PlatformToolset=v141_xp /p:Configuration=Release /p:PreferredToolArchitecture=x64 /p:Platform=Win32 /v:minimal
-          msbuild OpenXcom.2010.sln /m /p:BuildInParallel=true /p:PlatformToolset=v141_xp /p:Configuration=Release /p:PreferredToolArchitecture=x64 /p:Platform=x64 /v:minimal
+          msbuild OpenXcom.2010.sln $VC_FLAGS /p:Platform=Win32
+          msbuild OpenXcom.2010.sln $VC_FLAGS /p:Platform=x64
           cd ..
 
       - name: Pull translations

diff --git a/src/Basescape/CraftSoldiersState.cpp b/src/Basescape/CraftSoldiersState.cpp
@@ -18,6 +18,7 @@
  */
 #include "CraftSoldiersState.h"
 #include <algorithm>
+#include <functional>
 #include <climits>
 #include "../Engine/Action.h"
 #include "../Engine/Game.h"

diff --git a/src/Battlescape/DebriefingState.cpp b/src/Battlescape/DebriefingState.cpp
@@ -18,6 +18,7 @@
  */
 #include "DebriefingState.h"
 #include <algorithm>
+#include <functional>
 #include "CannotReequipState.h"
 #include "../Engine/Action.h"
 #include "../Engine/Game.h"

diff --git a/src/Menu/ListGamesState.cpp b/src/Menu/ListGamesState.cpp
@@ -18,6 +18,7 @@
  */
 #include "ListGamesState.h"
 #include <algorithm>
+#include <functional>
 #include "../Engine/Logger.h"
 #include "../Savegame/SavedGame.h"
 #include "../Engine/Game.h"

diff --git a/src/Mod/Mod.cpp b/src/Mod/Mod.cpp
@@ -18,6 +18,7 @@
  */
 #include "Mod.h"
 #include <algorithm>
+#include <functional>
 #include <sstream>
 #include <climits>
 #include <cassert>

diff --git a/src/Savegame/AlienMission.cpp b/src/Savegame/AlienMission.cpp
@@ -42,6 +42,7 @@
 #include "Waypoint.h"
 #include <assert.h>
 #include <algorithm>
+#include <functional>
 #include "../Mod/AlienDeployment.h"
 
 namespace OpenXcom

diff --git a/src/Savegame/Base.cpp b/src/Savegame/Base.cpp
@@ -20,6 +20,7 @@
 #include "../fmath.h"
 #include <stack>
 #include <algorithm>
+#include <functional>
 #include "BaseFacility.h"
 #include "../Mod/RuleBaseFacility.h"
 #include "Craft.h"

diff --git a/src/Savegame/SavedGame.cpp b/src/Savegame/SavedGame.cpp
@@ -21,6 +21,7 @@
 #include <sstream>
 #include <iomanip>
 #include <algorithm>
+#include <functional>
 #include <yaml-cpp/yaml.h>
 #include "../version.h"
 #include "../Engine/Logger.h"

diff --git a/src/Savegame/Ufo.cpp b/src/Savegame/Ufo.cpp
@@ -19,6 +19,7 @@
 #include "Ufo.h"
 #include <assert.h>
 #include <algorithm>
+#include <functional>
 #include "../fmath.h"
 #include "Craft.h"
 #include "AlienMission.h"