[Modify] SDL系ライブラリの配置を整理．

diff --git a/Deeangband.sln b/Deeangband.sln
index 9225947..8a03adc 100644 (file)
--- a/Deeangband.sln
+++ b/Deeangband.sln
@@ -1,20 +1,49 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
+# Blend for Visual Studio 15
+VisualStudioVersion = 15.0.28307.421
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Deeangband", "Deeangband\Deeangband.vcxproj", "{CD636819-CE76-4628-AFDD-EBAD7DB54687}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_image", "SDL2_image-2.0.4\VisualC\SDL_image.vcxproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_ttf", "SDL2_ttf-2.0.15\VisualC\SDL_ttf.vcxproj", "{DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
+               Debug|x64 = Debug|x64
                Release|Win32 = Release|Win32
+               Release|x64 = Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {CD636819-CE76-4628-AFDD-EBAD7DB54687}.Debug|Win32.ActiveCfg = Debug|Win32
                {CD636819-CE76-4628-AFDD-EBAD7DB54687}.Debug|Win32.Build.0 = Debug|Win32
+               {CD636819-CE76-4628-AFDD-EBAD7DB54687}.Debug|x64.ActiveCfg = Debug|Win32
                {CD636819-CE76-4628-AFDD-EBAD7DB54687}.Release|Win32.ActiveCfg = Release|Win32
                {CD636819-CE76-4628-AFDD-EBAD7DB54687}.Release|Win32.Build.0 = Release|Win32
+               {CD636819-CE76-4628-AFDD-EBAD7DB54687}.Release|x64.ActiveCfg = Release|Win32
+               {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.ActiveCfg = Debug|Win32
+               {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.Build.0 = Debug|Win32
+               {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.ActiveCfg = Debug|x64
+               {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.Build.0 = Debug|x64
+               {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.ActiveCfg = Release|Win32
+               {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.Build.0 = Release|Win32
+               {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.ActiveCfg = Release|x64
+               {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.Build.0 = Release|x64
+               {DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}.Debug|Win32.ActiveCfg = Debug|Win32
+               {DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}.Debug|Win32.Build.0 = Debug|Win32
+               {DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}.Debug|x64.ActiveCfg = Debug|x64
+               {DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}.Debug|x64.Build.0 = Debug|x64
+               {DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}.Release|Win32.ActiveCfg = Release|Win32
+               {DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}.Release|Win32.Build.0 = Release|Win32
+               {DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}.Release|x64.ActiveCfg = Release|x64
+               {DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
+       GlobalSection(ExtensibilityGlobals) = postSolution
+               SolutionGuid = {9017F85C-BB99-4E97-80CA-F509AB73C725}
+       EndGlobalSection
 EndGlobal

diff --git a/Deeangband/Deeangband.vcxproj b/Deeangband/Deeangband.vcxproj
index 3c9daa8..fbd0474 100644 (file)
--- a/Deeangband/Deeangband.vcxproj
+++ b/Deeangband/Deeangband.vcxproj
@@ -43,7 +43,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(SolutionDir)SDL2-2.0.9\include;$(SolutionDir)SDL2_image-2.0.4;$(SolutionDir)SDL2_ttf-2.0.15;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)SDL2-2.0.9\lib\x86;$(SolutionDir)lib32;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)\</OutDir>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
@@ -226,6 +226,17 @@
     <Image Include="Deeangband.ico" />
     <Image Include="small.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\SDL2_image-2.0.4\VisualC\SDL_image.vcxproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SDL2_image-2.0.4\VisualC\SDL_image.vcxproj">
+      <Project>{2bd5534e-00e2-4bea-ac96-d9a92ea24696}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\SDL2_ttf-2.0.15\VisualC\SDL_ttf.vcxproj">
+      <Project>{dddbd07d-dc76-4af6-8d02-3e2deb6ee255}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/Deeangband/Deeangband.vcxproj.filters b/Deeangband/Deeangband.vcxproj.filters
index f5c320a..2a2b7ff 100644 (file)
--- a/Deeangband/Deeangband.vcxproj.filters
+++ b/Deeangband/Deeangband.vcxproj.filters
@@ -395,4 +395,7 @@
       <UniqueIdentifier>{3181a8ab-5fa2-4854-9b71-cdae28af3b5c}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\SDL2_image-2.0.4\VisualC\SDL_image.vcxproj" />\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file