From 37353daaff5fe3b540007d12ec79c1feb28e96ed Mon Sep 17 00:00:00 2001 From: KurtLoeffler Date: Thu, 28 Dec 2023 17:32:18 -0800 Subject: [PATCH 1/4] Add "cpp_space_before_function_open_parenthesis = insert" to .editorconfig to enforce project code style (and avoid default vs behavior removing spaces). --- .editorconfig | 1 + 1 file changed, 1 insertion(+) 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 From 742b1f31e629ffa6f1a095c667b5426be410acec Mon Sep 17 00:00:00 2001 From: KurtLoeffler Date: Thu, 28 Dec 2023 17:32:33 -0800 Subject: [PATCH 2/4] - Ignore ironwail.vcxproj.user as this is a user specific settings file and is not included in the repo. --- .gitignore | 1 + 1 file changed, 1 insertion(+) 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 From 9b7ab46bfd5ff9e22d6f37517346c8cc3430eb44 Mon Sep 17 00:00:00 2001 From: KurtLoeffler Date: Thu, 28 Dec 2023 17:34:15 -0800 Subject: [PATCH 3/4] Add ironwail.pak to vs project so it gets copied to output directory. --- Windows/VisualStudio/ironwail.vcxproj | 5 +++++ Windows/VisualStudio/ironwail.vcxproj.filters | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Windows/VisualStudio/ironwail.vcxproj b/Windows/VisualStudio/ironwail.vcxproj index 0bb359b13..ade8b6d8b 100644 --- a/Windows/VisualStudio/ironwail.vcxproj +++ b/Windows/VisualStudio/ironwail.vcxproj @@ -414,6 +414,11 @@ copy "$(SolutionDir)..\zlib\$(PlatformShortName)\*.dll" "$(TargetDir)" + + + Document + + 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 @@ + + + Resource Files + + \ No newline at end of file From 8f73633bb898bc087c98ffa3527f0c364ab5fadd Mon Sep 17 00:00:00 2001 From: KurtLoeffler Date: Thu, 28 Dec 2023 17:37:16 -0800 Subject: [PATCH 4/4] 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. --- Windows/VisualStudio/ironwail.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Windows/VisualStudio/ironwail.vcxproj b/Windows/VisualStudio/ironwail.vcxproj index ade8b6d8b..38efb9d71 100644 --- a/Windows/VisualStudio/ironwail.vcxproj +++ b/Windows/VisualStudio/ironwail.vcxproj @@ -67,22 +67,22 @@ <_ProjectFileVersion>15.0.28307.799 - $(SolutionDir)Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(SolutionDir)Build-$(ProjectName)\bin\$(PlatformShortName)\$(Configuration)\ Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\ true - $(SolutionDir)Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(SolutionDir)Build-$(ProjectName)\bin\$(PlatformShortName)\$(Configuration)\ Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\ false - $(SolutionDir)Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(SolutionDir)Build-$(ProjectName)\bin\$(PlatformShortName)\$(Configuration)\ Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\ true - $(SolutionDir)Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(SolutionDir)Build-$(ProjectName)\bin\$(PlatformShortName)\$(Configuration)\ Build-$(ProjectName)\$(PlatformShortName)\$(Configuration)\ false