Update build settings for Windows.

bubio · Oct 23, 2023 · 9a39e26 · 9a39e26
1 parent ec45447
commit 9a39e26
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ Builder/Windows/SDL/include
 Builder/Windows/SDL/lib
 Builder/Windows/x64
 Builder/Windows/x86
+Builder/Windows/Win32
 Builder/Windows/XM8.vcxproj.user
 
 build/

diff --git a/Builder/Windows/XM8.vcxproj b/Builder/Windows/XM8.vcxproj
@@ -69,13 +69,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <LibraryPath>$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -87,8 +91,10 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_PC8801MA;SDL;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\SDL\include;$(ProjectDir)..\..\Source\UI;$(ProjectDir)..\..\Source\ePC-8801MA;$(ProjectDir)..\..\Source\ePC-8801MA\vm;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\SDL\include;$(ProjectDir)..\..\Source\UI;$(ProjectDir)..\..\Source\ePC-8801MA;$(ProjectDir)..\..\Source\ePC-8801MA\vm;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\Filter\xBRZ;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen</AdditionalIncludeDirectories>
       <StructMemberAlignment>Default</StructMemberAlignment>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -106,8 +112,10 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_PC8801MA;SDL;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\SDL\include;$(ProjectDir)..\..\Source\UI;$(ProjectDir)..\..\Source\ePC-8801MA;$(ProjectDir)..\..\Source\ePC-8801MA\vm;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\SDL\include;$(ProjectDir)..\..\Source\UI;$(ProjectDir)..\..\Source\ePC-8801MA;$(ProjectDir)..\..\Source\ePC-8801MA\vm;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\Filter\xBRZ;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen</AdditionalIncludeDirectories>
       <StructMemberAlignment>Default</StructMemberAlignment>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -128,10 +136,12 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_PC8801MA;SDL;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\SDL\include;$(ProjectDir)..\..\Source\UI;$(ProjectDir)..\..\Source\ePC-8801MA;$(ProjectDir)..\..\Source\ePC-8801MA\vm;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\SDL\include;$(ProjectDir)..\..\Source\UI;$(ProjectDir)..\..\Source\ePC-8801MA;$(ProjectDir)..\..\Source\ePC-8801MA\vm;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\Filter\xBRZ;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -155,9 +165,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_PC8801MA;SDL;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\SDL\include;$(ProjectDir)..\..\Source\UI;$(ProjectDir)..\..\Source\ePC-8801MA;$(ProjectDir)..\..\Source\ePC-8801MA\vm;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\SDL\include;$(ProjectDir)..\..\Source\UI;$(ProjectDir)..\..\Source\ePC-8801MA;$(ProjectDir)..\..\Source\ePC-8801MA\vm;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\Filter\xBRZ;$(ProjectDir)..\..\Source\ePC-8801MA\vm\fmgen;$(ProjectDir)..\..\Source\ePC-8801MA\vm\pc8801;$(ProjectDir)..\..\Source\Filter\xBRZ;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <LanguageStandard>Default</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -192,6 +203,7 @@
     <ClCompile Include="..\..\Source\ePC-8801MA\vm\upd1990a.cpp" />
     <ClCompile Include="..\..\Source\ePC-8801MA\vm\upd765a.cpp" />
     <ClCompile Include="..\..\Source\ePC-8801MA\vm\z80.cpp" />
+    <ClCompile Include="..\..\Source\Filter\xBRZ\xbrz.cpp" />
     <ClCompile Include="..\..\Source\UI\app.cpp" />
     <ClCompile Include="..\..\Source\UI\audio.cpp" />
     <ClCompile Include="..\..\Source\UI\converter.cpp" />
@@ -242,6 +254,9 @@
     <ClInclude Include="..\..\Source\ePC-8801MA\vm\upd765a.h" />
     <ClInclude Include="..\..\Source\ePC-8801MA\vm\vm.h" />
     <ClInclude Include="..\..\Source\ePC-8801MA\vm\z80.h" />
+    <ClInclude Include="..\..\Source\Filter\xBRZ\xbrz.h" />
+    <ClInclude Include="..\..\Source\Filter\xBRZ\xbrz_config.h" />
+    <ClInclude Include="..\..\Source\Filter\xBRZ\xbrz_tools.h" />
     <ClInclude Include="..\..\Source\UI\app.h" />
     <ClInclude Include="..\..\Source\UI\audio.h" />
     <ClInclude Include="..\..\Source\UI\classes.h" />

diff --git a/Builder/Windows/XM8.vcxproj.filters b/Builder/Windows/XM8.vcxproj.filters
@@ -43,6 +43,12 @@
     <Filter Include="ソース ファイル\ePC-8801MA\vm\pc8801">
       <UniqueIdentifier>{41fba1fe-06f0-4d9a-bd64-cd93d55b2b90}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ヘッダー ファイル\Filter">
+      <UniqueIdentifier>{91ca518e-fb96-41a0-97f2-2d6252d1d15e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ソース ファイル\Filter">
+      <UniqueIdentifier>{66dee534-0edd-489e-977f-554704204b5c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\UI\main.cpp">
@@ -162,6 +168,9 @@
     <ClCompile Include="..\..\Source\ePC-8801MA\vm\disksub.cpp">
       <Filter>ソース ファイル\ePC-8801MA\vm</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Filter\xBRZ\xbrz.cpp">
+      <Filter>ソース ファイル\Filter</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\ePC-8801MA\vm\z80.h">
@@ -308,6 +317,15 @@
     <ClInclude Include="..\..\Source\ePC-8801MA\vm\disksub.h">
       <Filter>ヘッダー ファイル\ePC-8801MA\vm</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Filter\xBRZ\xbrz.h">
+      <Filter>ヘッダー ファイル\Filter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Filter\xBRZ\xbrz_config.h">
+      <Filter>ヘッダー ファイル\Filter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Filter\xBRZ\xbrz_tools.h">
+      <Filter>ヘッダー ファイル\Filter</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="XM8.rc">