-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #326 from rcdailey/git-attributes
Introduce .gitattributes file and normalize line endings
- Loading branch information
Showing
7 changed files
with
565 additions
and
559 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
* text=auto | ||
*.sh eol=lf | ||
*.bat eol=crlf | ||
*.vcproj eol=crlf | ||
*.vcxproj eol=crlf | ||
*.sln eol=crlf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,33 @@ | ||
{ | ||
"cmake_variants" : [ | ||
{"name": "generator", | ||
"generators": [ | ||
{"generator": [ | ||
"Visual Studio 7 .NET 2003", | ||
"Visual Studio 9 2008", | ||
"Visual Studio 9 2008 Win64", | ||
"Visual Studio 10", | ||
"Visual Studio 10 Win64", | ||
"Visual Studio 11", | ||
"Visual Studio 11 Win64" | ||
] | ||
}, | ||
{"generator": ["MinGW Makefiles"], | ||
"env_prepend": [{"path": "c:/wut/prg/MinGW/bin"}] | ||
} | ||
] | ||
}, | ||
{"name": "shared_dll", | ||
"variables": [ | ||
["BUILD_SHARED_LIBS=true"], | ||
["BUILD_SHARED_LIBS=false"] | ||
] | ||
}, | ||
{"name": "build_type", | ||
"build_types": [ | ||
"debug", | ||
"release" | ||
] | ||
} | ||
] | ||
} | ||
{ | ||
"cmake_variants" : [ | ||
{"name": "generator", | ||
"generators": [ | ||
{"generator": [ | ||
"Visual Studio 7 .NET 2003", | ||
"Visual Studio 9 2008", | ||
"Visual Studio 9 2008 Win64", | ||
"Visual Studio 10", | ||
"Visual Studio 10 Win64", | ||
"Visual Studio 11", | ||
"Visual Studio 11 Win64" | ||
] | ||
}, | ||
{"generator": ["MinGW Makefiles"], | ||
"env_prepend": [{"path": "c:/wut/prg/MinGW/bin"}] | ||
} | ||
] | ||
}, | ||
{"name": "shared_dll", | ||
"variables": [ | ||
["BUILD_SHARED_LIBS=true"], | ||
["BUILD_SHARED_LIBS=false"] | ||
] | ||
}, | ||
{"name": "build_type", | ||
"build_types": [ | ||
"debug", | ||
"release" | ||
] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
{ | ||
"cmake_variants" : [ | ||
{"name": "generator", | ||
"generators": [ | ||
{"generator": [ | ||
"Visual Studio 6", | ||
"Visual Studio 7", | ||
"Visual Studio 8 2005" | ||
] | ||
} | ||
] | ||
}, | ||
{"name": "shared_dll", | ||
"variables": [ | ||
["BUILD_SHARED_LIBS=true"], | ||
["BUILD_SHARED_LIBS=false"] | ||
] | ||
}, | ||
{"name": "build_type", | ||
"build_types": [ | ||
"debug", | ||
"release" | ||
] | ||
} | ||
] | ||
} | ||
{ | ||
"cmake_variants" : [ | ||
{"name": "generator", | ||
"generators": [ | ||
{"generator": [ | ||
"Visual Studio 6", | ||
"Visual Studio 7", | ||
"Visual Studio 8 2005" | ||
] | ||
} | ||
] | ||
}, | ||
{"name": "shared_dll", | ||
"variables": [ | ||
["BUILD_SHARED_LIBS=true"], | ||
["BUILD_SHARED_LIBS=false"] | ||
] | ||
}, | ||
{"name": "build_type", | ||
"build_types": [ | ||
"debug", | ||
"release" | ||
] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,46 @@ | ||
Microsoft Visual Studio Solution File, Format Version 8.00 | ||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}" | ||
ProjectSection(ProjectDependencies) = postProject | ||
EndProjectSection | ||
EndProject | ||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}" | ||
ProjectSection(ProjectDependencies) = postProject | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B} | ||
EndProjectSection | ||
EndProject | ||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}" | ||
ProjectSection(ProjectDependencies) = postProject | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B} | ||
EndProjectSection | ||
EndProject | ||
Global | ||
GlobalSection(SolutionConfiguration) = preSolution | ||
Debug = Debug | ||
dummy = dummy | ||
Release = Release | ||
EndGlobalSection | ||
GlobalSection(ProjectConfiguration) = postSolution | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.ActiveCfg = Debug|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.Build.0 = Debug|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.ActiveCfg = Debug|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.Build.0 = Debug|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.ActiveCfg = Release|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.Build.0 = Release|Win32 | ||
EndGlobalSection | ||
GlobalSection(ExtensibilityGlobals) = postSolution | ||
EndGlobalSection | ||
GlobalSection(ExtensibilityAddIns) = postSolution | ||
EndGlobalSection | ||
EndGlobal | ||
Microsoft Visual Studio Solution File, Format Version 8.00 | ||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}" | ||
ProjectSection(ProjectDependencies) = postProject | ||
EndProjectSection | ||
EndProject | ||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}" | ||
ProjectSection(ProjectDependencies) = postProject | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B} | ||
EndProjectSection | ||
EndProject | ||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}" | ||
ProjectSection(ProjectDependencies) = postProject | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B} | ||
EndProjectSection | ||
EndProject | ||
Global | ||
GlobalSection(SolutionConfiguration) = preSolution | ||
Debug = Debug | ||
dummy = dummy | ||
Release = Release | ||
EndGlobalSection | ||
GlobalSection(ProjectConfiguration) = postSolution | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32 | ||
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32 | ||
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.ActiveCfg = Debug|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.Build.0 = Debug|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.ActiveCfg = Debug|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.Build.0 = Debug|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.ActiveCfg = Release|Win32 | ||
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.Build.0 = Release|Win32 | ||
EndGlobalSection | ||
GlobalSection(ExtensibilityGlobals) = postSolution | ||
EndGlobalSection | ||
GlobalSection(ExtensibilityAddIns) = postSolution | ||
EndGlobalSection | ||
EndGlobal |
Oops, something went wrong.