From 595c5a2ec46c14caf2f4bd1658336960e34a67e0 Mon Sep 17 00:00:00 2001
From: KurtLoeffler <kurtloeffler@gmail.com>
Date: Fri, 29 Dec 2023 01:40:18 -0800
Subject: [PATCH] VS project improvements (#288)

* Add "cpp_space_before_function_open_parenthesis = insert" to .editorconfig to enforce project code style (and avoid default vs behavior removing spaces).

* - Ignore ironwail.vcxproj.user as this is a user specific settings file and is not included in the repo.

* Add ironwail.pak to vs project so it gets copied to output directory.

* Add a /bin/ path to the project output directory so that the output files go into a clean folder instead of being output into the intermediate folder.
---
 .editorconfig                                 |  1 +
 .gitignore                                    |  1 +
 Windows/VisualStudio/ironwail.vcxproj         | 13 +++++++++----
 Windows/VisualStudio/ironwail.vcxproj.filters |  5 +++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index ba49e3c23..5ef965f7d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,3 +3,4 @@ root = true
 [*]
 indent_style = tab
 indent_size = 4
+cpp_space_before_function_open_parenthesis = insert
diff --git a/.gitignore b/.gitignore
index 234fd9edc..c5cdca9bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 Windows/VisualStudio/.vs/
 Windows/VisualStudio/Build-*/
+Windows/VisualStudio/ironwail.vcxproj.user
 Quake/*.o
 Quake/*.d
 Quake/*.res
diff --git a/Windows/VisualStudio/ironwail.vcxproj b/Windows/VisualStudio/ironwail.vcxproj
index 0bb359b13..38efb9d71 100644
--- a/Windows/VisualStudio/ironwail.vcxproj
+++ b/Windows/VisualStudio/ironwail.vcxproj
@@ -67,22 +67,22 @@
     <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)Build-$(ProjectName)\bin\$(PlatformShortName)\$(Configuration)\</OutDir>
     <IntDir>Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)Build-$(ProjectName)\bin\$(PlatformShortName)\$(Configuration)\</OutDir>
     <IntDir>Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)Build-$(ProjectName)\bin\$(PlatformShortName)\$(Configuration)\</OutDir>
     <IntDir>Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)Build-$(ProjectName)\bin\$(PlatformShortName)\$(Configuration)\</OutDir>
     <IntDir>Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
@@ -414,6 +414,11 @@ copy "$(SolutionDir)..\zlib\$(PlatformShortName)\*.dll" "$(TargetDir)"</Command>
   <ItemGroup>
     <Natvis Include="ironwail.natvis" />
   </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="..\..\Quake\ironwail.pak">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Windows/VisualStudio/ironwail.vcxproj.filters b/Windows/VisualStudio/ironwail.vcxproj.filters
index 023e0873e..7120a9ff6 100644
--- a/Windows/VisualStudio/ironwail.vcxproj.filters
+++ b/Windows/VisualStudio/ironwail.vcxproj.filters
@@ -485,4 +485,9 @@
   <ItemGroup>
     <Natvis Include="ironwail.natvis" />
   </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="..\..\Quake\ironwail.pak">
+      <Filter>Resource Files</Filter>
+    </CopyFileToFolders>
+  </ItemGroup>
 </Project>
\ No newline at end of file