Skip to content

Commit

Permalink
VS project improvements (#288)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
KurtLoeffler authored Dec 29, 2023
1 parent e03e7ca commit 595c5a2
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ root = true
[*]
indent_style = tab
indent_size = 4
cpp_space_before_function_open_parenthesis = insert
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Windows/VisualStudio/.vs/
Windows/VisualStudio/Build-*/
Windows/VisualStudio/ironwail.vcxproj.user
Quake/*.o
Quake/*.d
Quake/*.res
Expand Down
13 changes: 9 additions & 4 deletions Windows/VisualStudio/ironwail.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions Windows/VisualStudio/ironwail.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -485,4 +485,9 @@
<ItemGroup>
<Natvis Include="ironwail.natvis" />
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="..\..\Quake\ironwail.pak">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
</ItemGroup>
</Project>

0 comments on commit 595c5a2

Please sign in to comment.