RUNS IN VS2019

crisbh · Feb 28, 2020 · b1961f8 · b1961f8
1 parent 76d40fa
commit b1961f8
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,8 @@ UAlbertaBot/UAB_ErrorLog.txt
 UAlbertaBot/UAB_ErrorLog.txt
 BOSS/VisualStudio/BOSS.VC.db
 *.bwta
+*.db
+*.ipch
+*.opendb
+*.db-shm
+*.db-wal
diff --git a/BOSS/VisualStudio/BOSS.vcxproj b/BOSS/VisualStudio/BOSS.vcxproj
@@ -100,14 +100,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/SparCraft/VisualStudio/SparCraft.vcxproj b/SparCraft/VisualStudio/SparCraft.vcxproj
@@ -29,12 +29,12 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PlatformToolset>v110</PlatformToolset>

diff --git a/UAlbertaBot/Source/Config.h b/UAlbertaBot/Source/Config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "BWAPI.h"
+#include <set>
 #include <cassert>
 
 namespace Config

diff --git a/UAlbertaBot/VisualStudio/UAlbertaBot.vcxproj b/UAlbertaBot/VisualStudio/UAlbertaBot.vcxproj
@@ -22,12 +22,12 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/UAlbertaBot/VisualStudio/UAlbertaBot.vcxproj.filters b/UAlbertaBot/VisualStudio/UAlbertaBot.vcxproj.filters
@@ -143,12 +143,18 @@
     </ClCompile>
     <ClCompile Include="..\Source\main.cpp" />
     <ClCompile Include="..\Source\UAlbertaBotModule.cpp" />
-    <ClCompile Include="..\Source\BaseLocation.cpp" />
-    <ClCompile Include="..\Source\BaseLocationManager.cpp" />
-    <ClCompile Include="..\Source\DMap.cpp" />
     <ClCompile Include="..\source\ScoutManager.cpp">
       <Filter>game\combat\micro</Filter>
     </ClCompile>
+    <ClCompile Include="..\Source\BaseLocation.cpp">
+      <Filter>util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\BaseLocationManager.cpp">
+      <Filter>util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DMap.cpp">
+      <Filter>util</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Source\CombatCommander.h">
@@ -269,11 +275,17 @@
       <Filter>game\util</Filter>
     </ClInclude>
     <ClInclude Include="..\Source\UAlbertaBotModule.h" />
-    <ClInclude Include="..\Source\BaseLocation.h" />
-    <ClInclude Include="..\Source\BaseLocationManager.h" />
-    <ClInclude Include="..\Source\DMap.h" />
     <ClInclude Include="..\source\ScoutManager.h">
       <Filter>game\combat\micro</Filter>
     </ClInclude>
+    <ClInclude Include="..\Source\BaseLocation.h">
+      <Filter>util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\BaseLocationManager.h">
+      <Filter>util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\DMap.h">
+      <Filter>util</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>