From d5f277cc7e6c0c20e73ac79c5a9c004ac7c21f74 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 9 May 2018 18:35:46 -0700 Subject: [PATCH] Added editorconfig --- .editorconfig | 9 +++++++++ UVAtlas/UVAtlas_2017_Win10.sln | 14 ++++++++++++-- UVAtlas/UVAtlas_Windows10.sln | 12 ++++++++++-- UVAtlas/UVAtlas_XboxOneXDK_2017.sln | 14 ++++++++++++-- UVAtlasTool/UVAtlasTool_2017.sln | 14 ++++++++++++-- 5 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b05c9ea --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*.{cpp,h,hpp,inl}] +indent_size = 4 +indent_style = space +trim_trailing_whitespace = true +insert_final_newline = true +end_of_line = crlf +charset = latin1 diff --git a/UVAtlas/UVAtlas_2017_Win10.sln b/UVAtlas/UVAtlas_2017_Win10.sln index 0e380c0..67da5c1 100644 --- a/UVAtlas/UVAtlas_2017_Win10.sln +++ b/UVAtlas/UVAtlas_2017_Win10.sln @@ -1,7 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2017 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2017", "UVAtlas_2017_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}" +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2000 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2017_Win10", "UVAtlas_2017_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{092D565A-3AC4-479C-B3A6-D5D0C83E6881}" + ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,4 +34,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A5DEA94B-8E75-40B0-A965-199706720DDC} + EndGlobalSection EndGlobal diff --git a/UVAtlas/UVAtlas_Windows10.sln b/UVAtlas/UVAtlas_Windows10.sln index 8ff7d4b..5d71877 100644 --- a/UVAtlas/UVAtlas_Windows10.sln +++ b/UVAtlas/UVAtlas_Windows10.sln @@ -1,10 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2017 -VisualStudioVersion = 14.0.22609.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2000 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "UVAtlas_Windows10.vcxproj", "{2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BEADBA94-103D-4BBE-BA6D-76280354E51D}" + ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -31,4 +36,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {98B19305-E614-4DAF-86CC-CF3476DE6993} + EndGlobalSection EndGlobal diff --git a/UVAtlas/UVAtlas_XboxOneXDK_2017.sln b/UVAtlas/UVAtlas_XboxOneXDK_2017.sln index b2eece7..4c0f43a 100644 --- a/UVAtlas/UVAtlas_XboxOneXDK_2017.sln +++ b/UVAtlas/UVAtlas_XboxOneXDK_2017.sln @@ -1,7 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "UVAtlas_XboxOneXDK_2017.vcxproj", "{5959D651-867B-4AD9-BABD-4265310B6D5D}" +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2000 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_XboxOneXDK_2017", "UVAtlas_XboxOneXDK_2017.vcxproj", "{5959D651-867B-4AD9-BABD-4265310B6D5D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6F8C099A-349F-40E8-8D9F-D0B3B6CDCB49}" + ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -20,4 +27,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {029D3A14-07EE-4D69-A40C-204AB05DEF66} + EndGlobalSection EndGlobal diff --git a/UVAtlasTool/UVAtlasTool_2017.sln b/UVAtlasTool/UVAtlasTool_2017.sln index 1b2f2ed..28409c1 100644 --- a/UVAtlasTool/UVAtlasTool_2017.sln +++ b/UVAtlasTool/UVAtlasTool_2017.sln @@ -1,12 +1,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2017 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2000 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlasTool", "UVAtlasTool_2017.vcxproj", "{A7969CB3-E89B-49B9-96E7-8A219785A7CB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\..\DirectXTex\DirectXTex\DirectXTex_Desktop_2017.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXMesh", "..\..\DirectXMesh\DirectXMesh\DirectXMesh_Desktop_2017.vcxproj", "{6857F086-F6FE-4150-9ED7-7446F1C1C220}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "..\UVAtlas\UVAtlas_2017_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2017_Win10", "..\UVAtlas\UVAtlas_2017_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1E8D0984-C342-4C66-B288-23D5D44F531E}" + ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,4 +77,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F576ED7C-BC0D-42CD-90EB-0E206EEA9F74} + EndGlobalSection EndGlobal