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 - $(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 @@ -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