Merge pull request #327 from cdunn2001/more-gitattributes

More gitattributes
This commit is contained in:
Christopher Dunn 2015-08-09 16:38:21 -07:00
commit 585446e6b3
3 changed files with 14 additions and 9 deletions

5
.gitattributes vendored
View File

@ -1,6 +1,11 @@
* text=auto * text=auto
*.h text
*.cpp text
*.json text
*.in text
*.sh eol=lf *.sh eol=lf
*.bat eol=crlf *.bat eol=crlf
*.vcproj eol=crlf *.vcproj eol=crlf
*.vcxproj eol=crlf *.vcxproj eol=crlf
*.sln eol=crlf *.sln eol=crlf
devtools/agent_vm* eol=crlf

View File

@ -10,12 +10,12 @@
"Visual Studio 10 Win64", "Visual Studio 10 Win64",
"Visual Studio 11", "Visual Studio 11",
"Visual Studio 11 Win64" "Visual Studio 11 Win64"
] ]
}, },
{"generator": ["MinGW Makefiles"], {"generator": ["MinGW Makefiles"],
"env_prepend": [{"path": "c:/wut/prg/MinGW/bin"}] "env_prepend": [{"path": "c:/wut/prg/MinGW/bin"}]
} }
] ]
}, },
{"name": "shared_dll", {"name": "shared_dll",
"variables": [ "variables": [
@ -25,8 +25,8 @@
}, },
{"name": "build_type", {"name": "build_type",
"build_types": [ "build_types": [
"debug", "debug",
"release" "release"
] ]
} }
] ]

View File

@ -6,9 +6,9 @@
"Visual Studio 6", "Visual Studio 6",
"Visual Studio 7", "Visual Studio 7",
"Visual Studio 8 2005" "Visual Studio 8 2005"
] ]
} }
] ]
}, },
{"name": "shared_dll", {"name": "shared_dll",
"variables": [ "variables": [
@ -18,8 +18,8 @@
}, },
{"name": "build_type", {"name": "build_type",
"build_types": [ "build_types": [
"debug", "debug",
"release" "release"
] ]
} }
] ]