- Updated VS2017 & VS2019 projects

- Updated joystick controls to use new Input.JoyIDList config property
iarwain · Apr 2, 2021 · e14df00 · e14df00
1 parent 6df91c9
commit e14df00
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 211 deletions.
diff --git a/build/windows/vs2017/LostEcho.vcxproj b/build/windows/vs2017/LostEcho.vcxproj
@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}</ProjectGuid>
+    <ProjectGuid>{B86FBB40-93A8-5942-80A3-ED60BD08A34F}</ProjectGuid>
     <RootNamespace>LostEcho</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
@@ -393,22 +393,23 @@
     <None Include="..\..\..\include\Scroll\ScrollBase.inl" />
     <None Include="..\..\..\include\Scroll\ScrollEd.inl" />
     <None Include="..\..\..\include\Scroll\ScrollObject.inl" />
+    <None Include="..\..\..\data\config\alphadeck.ini" />
     <None Include="..\..\..\data\config\card.ini" />
     <None Include="..\..\..\data\config\CreationTemplate.ini" />
     <None Include="..\..\..\data\config\dev.ini" />
     <None Include="..\..\..\data\config\font.ini" />
     <None Include="..\..\..\data\config\gameover.ini" />
     <None Include="..\..\..\data\config\geodeck.ini" />
-    <None Include="..\..\..\data\config\ggj2021.ini" />
     <None Include="..\..\..\data\config\LostEcho.ini" />
     <None Include="..\..\..\data\config\LostEchod.ini" />
     <None Include="..\..\..\data\config\LostEchop.ini" />
     <None Include="..\..\..\data\config\pixeldeck.ini" />
     <None Include="..\..\..\data\config\player.ini" />
+    <None Include="..\..\..\data\config\select.ini" />
     <None Include="..\..\..\data\config\SettingsTemplate.ini" />
     <None Include="..\..\..\data\config\sound.ini" />
-    <None Include="..\..\..\data\config\startmenu.ini" />
     <None Include="..\..\..\data\config\table.ini" />
+    <None Include="..\..\..\data\config\title.ini" />
     <None Include="..\..\..\data\config\tutorial.ini" />
   </ItemGroup>
   <ItemGroup>

diff --git a/build/windows/vs2017/LostEcho.vcxproj.filters b/build/windows/vs2017/LostEcho.vcxproj.filters
@@ -2,25 +2,25 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="src">
-      <UniqueIdentifier>{E1EA2239-ECAB-2542-BC92-BC7BAEA8D23E}</UniqueIdentifier>
+      <UniqueIdentifier>{A466FFFC-4DA3-6848-A4D4-75783AF67EA8}</UniqueIdentifier>
     </Filter>
     <Filter Include="include">
-      <UniqueIdentifier>{ADC0E8DB-1609-0548-8F21-16A9ECC7C6BB}</UniqueIdentifier>
+      <UniqueIdentifier>{2CCC36F7-AA44-7C48-9C8C-B058AD66DDF8}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\Scroll">
-      <UniqueIdentifier>{ED934855-B2AD-E641-8F55-6DB9A5E233E3}</UniqueIdentifier>
+      <UniqueIdentifier>{D6915813-EB68-EF42-8311-4554A5E97CD0}</UniqueIdentifier>
     </Filter>
     <Filter Include="inline">
-      <UniqueIdentifier>{A417166B-1AD5-C84C-953C-167F4626018B}</UniqueIdentifier>
+      <UniqueIdentifier>{B7E4F991-EB82-1846-9A6D-446E6ABAA9B7}</UniqueIdentifier>
     </Filter>
     <Filter Include="config">
-      <UniqueIdentifier>{EA60A37B-FFC8-B444-A66F-AAFD5335567A}</UniqueIdentifier>
+      <UniqueIdentifier>{A0D43FEE-2B37-9944-819C-12ED7898EDCC}</UniqueIdentifier>
     </Filter>
     <Filter Include="data">
-      <UniqueIdentifier>{3356D7CD-3BCA-5C4D-9359-525139D25DFB}</UniqueIdentifier>
+      <UniqueIdentifier>{C46E9107-399B-9B45-B2FB-2C562DAD3BC7}</UniqueIdentifier>
     </Filter>
     <Filter Include="data\resource">
-      <UniqueIdentifier>{510E3906-17CD-0E46-95B9-7ED1E0844BD2}</UniqueIdentifier>
+      <UniqueIdentifier>{132FD328-ED52-F94D-BD3D-2EF193959C36}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -36,6 +36,9 @@
     <None Include="..\..\..\include\Scroll\ScrollObject.inl">
       <Filter>inline</Filter>
     </None>
+    <None Include="..\..\..\data\config\alphadeck.ini">
+      <Filter>config</Filter>
+    </None>
     <None Include="..\..\..\data\config\card.ini">
       <Filter>config</Filter>
     </None>
@@ -54,9 +57,6 @@
     <None Include="..\..\..\data\config\geodeck.ini">
       <Filter>config</Filter>
     </None>
-    <None Include="..\..\..\data\config\ggj2021.ini">
-      <Filter>config</Filter>
-    </None>
     <None Include="..\..\..\data\config\LostEcho.ini">
       <Filter>config</Filter>
     </None>
@@ -72,16 +72,19 @@
     <None Include="..\..\..\data\config\player.ini">
       <Filter>config</Filter>
     </None>
+    <None Include="..\..\..\data\config\select.ini">
+      <Filter>config</Filter>
+    </None>
     <None Include="..\..\..\data\config\SettingsTemplate.ini">
       <Filter>config</Filter>
     </None>
     <None Include="..\..\..\data\config\sound.ini">
       <Filter>config</Filter>
     </None>
-    <None Include="..\..\..\data\config\startmenu.ini">
+    <None Include="..\..\..\data\config\table.ini">
       <Filter>config</Filter>
     </None>
-    <None Include="..\..\..\data\config\table.ini">
+    <None Include="..\..\..\data\config\title.ini">
       <Filter>config</Filter>
     </None>
     <None Include="..\..\..\data\config\tutorial.ini">

diff --git a/build/windows/vs2017/ggj2021.sln b/build/windows/vs2017/ggj2021.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2017
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LostEcho", "LostEcho.vcxproj", "{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LostEcho", "LostEcho.vcxproj", "{B86FBB40-93A8-5942-80A3-ED60BD08A34F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,18 +13,18 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Debug|x64.ActiveCfg = Debug|x64
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Debug|x64.Build.0 = Debug|x64
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Debug|Win32.Build.0 = Debug|Win32
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Profile|x64.ActiveCfg = Profile|x64
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Profile|x64.Build.0 = Profile|x64
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Profile|Win32.ActiveCfg = Profile|Win32
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Profile|Win32.Build.0 = Profile|Win32
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Release|x64.ActiveCfg = Release|x64
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Release|x64.Build.0 = Release|x64
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Release|Win32.ActiveCfg = Release|Win32
-		{5730C6E6-82EF-6540-9C6E-1740A56D6DC5}.Release|Win32.Build.0 = Release|Win32
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Debug|x64.ActiveCfg = Debug|x64
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Debug|x64.Build.0 = Debug|x64
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Debug|Win32.Build.0 = Debug|Win32
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Profile|x64.ActiveCfg = Profile|x64
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Profile|x64.Build.0 = Profile|x64
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Profile|Win32.ActiveCfg = Profile|Win32
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Profile|Win32.Build.0 = Profile|Win32
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Release|x64.ActiveCfg = Release|x64
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Release|x64.Build.0 = Release|x64
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Release|Win32.ActiveCfg = Release|Win32
+		{B86FBB40-93A8-5942-80A3-ED60BD08A34F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/build/windows/vs2019/LostEcho.vcxproj b/build/windows/vs2019/LostEcho.vcxproj
@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}</ProjectGuid>
+    <ProjectGuid>{25FB97D6-ABD5-D24C-8382-63609982636F}</ProjectGuid>
     <RootNamespace>LostEcho</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
@@ -393,22 +393,23 @@
     <None Include="..\..\..\include\Scroll\ScrollBase.inl" />
     <None Include="..\..\..\include\Scroll\ScrollEd.inl" />
     <None Include="..\..\..\include\Scroll\ScrollObject.inl" />
+    <None Include="..\..\..\data\config\alphadeck.ini" />
     <None Include="..\..\..\data\config\card.ini" />
     <None Include="..\..\..\data\config\CreationTemplate.ini" />
     <None Include="..\..\..\data\config\dev.ini" />
     <None Include="..\..\..\data\config\font.ini" />
     <None Include="..\..\..\data\config\gameover.ini" />
     <None Include="..\..\..\data\config\geodeck.ini" />
-    <None Include="..\..\..\data\config\ggj2021.ini" />
     <None Include="..\..\..\data\config\LostEcho.ini" />
     <None Include="..\..\..\data\config\LostEchod.ini" />
     <None Include="..\..\..\data\config\LostEchop.ini" />
     <None Include="..\..\..\data\config\pixeldeck.ini" />
     <None Include="..\..\..\data\config\player.ini" />
+    <None Include="..\..\..\data\config\select.ini" />
     <None Include="..\..\..\data\config\SettingsTemplate.ini" />
     <None Include="..\..\..\data\config\sound.ini" />
-    <None Include="..\..\..\data\config\startmenu.ini" />
     <None Include="..\..\..\data\config\table.ini" />
+    <None Include="..\..\..\data\config\title.ini" />
     <None Include="..\..\..\data\config\tutorial.ini" />
   </ItemGroup>
   <ItemGroup>

diff --git a/build/windows/vs2019/LostEcho.vcxproj.filters b/build/windows/vs2019/LostEcho.vcxproj.filters
@@ -2,25 +2,25 @@
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="src">
-      <UniqueIdentifier>{952E69D1-F377-CD4F-B373-BC653ACD0618}</UniqueIdentifier>
+      <UniqueIdentifier>{5E2EE284-E5D3-A444-9DC5-B71B5799A7F3}</UniqueIdentifier>
     </Filter>
     <Filter Include="include">
-      <UniqueIdentifier>{D23EBA84-0734-604B-AD35-E15A4E64E8AB}</UniqueIdentifier>
+      <UniqueIdentifier>{15B44BF7-434A-2546-83FD-F821F5B019E0}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\Scroll">
-      <UniqueIdentifier>{A51686A4-6A7A-B24B-82EB-1B07517047E3}</UniqueIdentifier>
+      <UniqueIdentifier>{48052B5B-03F3-094B-B8F3-3030443239DE}</UniqueIdentifier>
     </Filter>
     <Filter Include="inline">
-      <UniqueIdentifier>{D170D646-288B-4C46-94AB-20172BD27121}</UniqueIdentifier>
+      <UniqueIdentifier>{C5B20156-F597-DB42-A56A-FF581227906E}</UniqueIdentifier>
     </Filter>
     <Filter Include="config">
-      <UniqueIdentifier>{4341F59E-C1E9-7445-A98B-070C09E6E330}</UniqueIdentifier>
+      <UniqueIdentifier>{7CFEAC95-B4C7-4D43-ACA7-C174D623EA56}</UniqueIdentifier>
     </Filter>
     <Filter Include="data">
-      <UniqueIdentifier>{F49291E3-A662-D048-8ABE-0FE8F4F80B8F}</UniqueIdentifier>
+      <UniqueIdentifier>{EA2858BF-BBA8-864B-ADBB-18059958C5B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="data\resource">
-      <UniqueIdentifier>{411B4C06-DB84-7D44-9ABD-76D91CE3E27E}</UniqueIdentifier>
+      <UniqueIdentifier>{6F7F117C-943C-6E47-BC2A-A66B991925A7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -36,6 +36,9 @@
     <None Include="..\..\..\include\Scroll\ScrollObject.inl">
       <Filter>inline</Filter>
     </None>
+    <None Include="..\..\..\data\config\alphadeck.ini">
+      <Filter>config</Filter>
+    </None>
     <None Include="..\..\..\data\config\card.ini">
       <Filter>config</Filter>
     </None>
@@ -54,9 +57,6 @@
     <None Include="..\..\..\data\config\geodeck.ini">
       <Filter>config</Filter>
     </None>
-    <None Include="..\..\..\data\config\ggj2021.ini">
-      <Filter>config</Filter>
-    </None>
     <None Include="..\..\..\data\config\LostEcho.ini">
       <Filter>config</Filter>
     </None>
@@ -72,16 +72,19 @@
     <None Include="..\..\..\data\config\player.ini">
       <Filter>config</Filter>
     </None>
+    <None Include="..\..\..\data\config\select.ini">
+      <Filter>config</Filter>
+    </None>
     <None Include="..\..\..\data\config\SettingsTemplate.ini">
       <Filter>config</Filter>
     </None>
     <None Include="..\..\..\data\config\sound.ini">
       <Filter>config</Filter>
     </None>
-    <None Include="..\..\..\data\config\startmenu.ini">
+    <None Include="..\..\..\data\config\table.ini">
       <Filter>config</Filter>
     </None>
-    <None Include="..\..\..\data\config\table.ini">
+    <None Include="..\..\..\data\config\title.ini">
       <Filter>config</Filter>
     </None>
     <None Include="..\..\..\data\config\tutorial.ini">

diff --git a/build/windows/vs2019/ggj2021.sln b/build/windows/vs2019/ggj2021.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2019
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LostEcho", "LostEcho.vcxproj", "{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LostEcho", "LostEcho.vcxproj", "{25FB97D6-ABD5-D24C-8382-63609982636F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,18 +13,18 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Debug|x64.ActiveCfg = Debug|x64
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Debug|x64.Build.0 = Debug|x64
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Debug|Win32.Build.0 = Debug|Win32
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Profile|x64.ActiveCfg = Profile|x64
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Profile|x64.Build.0 = Profile|x64
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Profile|Win32.ActiveCfg = Profile|Win32
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Profile|Win32.Build.0 = Profile|Win32
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Release|x64.ActiveCfg = Release|x64
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Release|x64.Build.0 = Release|x64
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Release|Win32.ActiveCfg = Release|Win32
-		{A5DD2D8B-410D-8848-81D7-F14C972E2EB8}.Release|Win32.Build.0 = Release|Win32
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Debug|x64.ActiveCfg = Debug|x64
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Debug|x64.Build.0 = Debug|x64
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Debug|Win32.Build.0 = Debug|Win32
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Profile|x64.ActiveCfg = Profile|x64
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Profile|x64.Build.0 = Profile|x64
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Profile|Win32.ActiveCfg = Profile|Win32
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Profile|Win32.Build.0 = Profile|Win32
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Release|x64.ActiveCfg = Release|x64
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Release|x64.Build.0 = Release|x64
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Release|Win32.ActiveCfg = Release|Win32
+		{25FB97D6-ABD5-D24C-8382-63609982636F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE