mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-21 21:55:38 +00:00
Added license file and updated documentation for the GLM library.
This commit is contained in:
parent
87a1812fcc
commit
6fcd625e48
|
@ -11,6 +11,7 @@
|
||||||
### Detailed list of changes
|
### Detailed list of changes
|
||||||
|
|
||||||
* Added a menu option to change the application exit key combination
|
* Added a menu option to change the application exit key combination
|
||||||
|
* Added the GLM (OpenGL Mathematics) library as a Git subtree
|
||||||
|
|
||||||
### Bug fixes
|
### Bug fixes
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,9 @@ http://www.freeimage.sourceforge.net
|
||||||
GLEW \
|
GLEW \
|
||||||
http://glew.sourceforge.net
|
http://glew.sourceforge.net
|
||||||
|
|
||||||
|
GLM \
|
||||||
|
https://github.com/g-truc/glm
|
||||||
|
|
||||||
libVLC \
|
libVLC \
|
||||||
https://wiki.videolan.org/LibVLC
|
https://wiki.videolan.org/LibVLC
|
||||||
|
|
||||||
|
|
54
licenses/GLM
Normal file
54
licenses/GLM
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
================================================================================
|
||||||
|
OpenGL Mathematics (GLM)
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
GLM is licensed under The Happy Bunny License or MIT License
|
||||||
|
|
||||||
|
================================================================================
|
||||||
|
The Happy Bunny License (Modified MIT License)
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
Copyright (c) 2005 - G-Truc Creation
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
Restrictions:
|
||||||
|
By making use of the Software for military purposes, you choose to make a
|
||||||
|
Bunny unhappy.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
================================================================================
|
||||||
|
The MIT License
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
Copyright (c) 2005 - G-Truc Creation
|
||||||
|
|
||||||
|
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.
|
Loading…
Reference in a new issue