Update README and add LICENSE

This commit is contained in:
Henrik Rydgard 2012-03-31 10:32:57 +02:00
parent 315e225684
commit dc7c033a3c
2 changed files with 15 additions and 7 deletions

9
LICENSE.TXT Normal file
View File

@ -0,0 +1,9 @@
Copyright (C) 2012 Henrik Rydgard
This applies to all the code here not covered under other licenses, see README.md.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -6,18 +6,17 @@ This is my library of stuff that I use when writing C++ programs, mostly for And
This project incorporates code from a variety of public domain or similarly-licensed code. This is the list:
etcpack by Ericsson, in a cleaned up form. public domain?
sha1, public domain implementation by Dominik Reichl
json_writer by me (Henrik Rydgård)
vjson in a heavily modified form, originally by ??? (TODO)
libzip with attribution "Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner"
stb_vorbis, public domain by Sean Barrett of RAD Tools
* etcpack by Ericsson, in a cleaned up form. Has strange license but not very limiting - you can only use the code for making textures for hardware supporting ETC1, or something like that. Don't think it affects the rest of the code in any way.
* sha1, public domain implementation by Dominik Reichl
* vjson in a heavily modified form, originally by Ivan Vashchaev (TODO: break out into its own repo?)
* libzip with attribution "Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner"
* stb_vorbis, public domain by Sean Barrett of RAD Tools
If you're not okay with the licenses above, don't use this code.
If you find this useful for your own projects, drop me a line at hrydgard@gmail.com .
I hereby release all code here not under the licenses above to the public domain.
I hereby release all code here not under the licenses above under the MIT license.
Henrik Rydgård