summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--README.md22
-rw-r--r--docs/license.txt35
-rw-r--r--docs/licenseinfo.txt4
3 files changed, 22 insertions, 39 deletions
diff --git a/README.md b/README.md
index 1fc7ca7a9b4..342ae94d364 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,23 @@ MESS (Multi Emulator Super System) is the sister project of MAME. MESS documents
The MESS and MAME projects live in the same source repository and share much of the same code, but are different build targets.
+License
+=======
+
+MAME is Open Source project now, we are still in process of contacting all developers from past to get their wish of license.
+So far situation is that
+
+|License|Percentage|
+|---|---|
+|[BSD-3-Clause](http://spdx.org/licenses/BSD-3-Clause)|86%|
+|[LGPL-2.1+](http://spdx.org/licenses/LGPL-2.1+)|3%|
+|[GPL-2.0+](http://spdx.org/licenses/GPL-2.0+)|5%|
+|not defined|6%|
+
+Please note that all files that do not have explicit license are still pending decision from authors and till they are marked with some should not be used by other prjects/forks.
+
+Since licenses are compatible but some are more permissive then others, as whole MAME will be delivered as GPL-2.0+ software.
+
How to compile?
=============
@@ -64,3 +81,8 @@ Contributing
MAME source code should be viewed and edited with your editor set to use four spaces per tab. Tabs are used for initial indentation of lines, with one tab used per indentation level. Spaces are used for other alignment within a line.
Some parts of the code follow [GNU style](http://www.gnu.org/prep/standards/html_node/Formatting.html); some parts of the code follow [K&R style](https://en.wikipedia.org/wiki/Indent_style#K.26R_style) -- mostly depending on who wrote the original version. **Above all else, be consistent with what you modify, and keep whitespace changes to a minimum when modifying existing source.** For new code, the majority tends to prefer GNU style, so if you don't care much, use that.
+
+All contributors need to either add standard header for license info (on new files) or send us their wish under which of licenses they would like their code to be published under.
+[BSD-3-Clause](http://spdx.org/licenses/BSD-3-Clause)
+[LGPL-2.1+](http://spdx.org/licenses/LGPL-2.1+)
+[GPL-2.0+](http://spdx.org/licenses/GPL-2.0+)
diff --git a/docs/license.txt b/docs/license.txt
deleted file mode 100644
index 33267a54cb1..00000000000
--- a/docs/license.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Unless otherwise explicitly stated, all code in MAME is released under the
-following license:
-
-Copyright Nicola Salmoria and the MAME team
-All rights reserved.
-
-Redistribution and use of this code or any derivative works are permitted
-provided that the following conditions are met:
-
-* Redistributions may not be sold, nor may they be used in a commercial
-product or activity.
-
-* Redistributions that are modified from the original source must include the
-complete source code, including the source code for all components used by a
-binary built from the modified sources. However, as a special exception, the
-source code distributed need not include anything that is normally distributed
-(in either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-
-* Redistributions must reproduce the above copyright notice, this list of
-conditions and the following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/licenseinfo.txt b/docs/licenseinfo.txt
deleted file mode 100644
index 91ae09434f6..00000000000
--- a/docs/licenseinfo.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-BSD-3-Clause: http://spdx.org/licenses/BSD-3-Clause
-GPL-2.0+: http://spdx.org/licenses/GPL-2.0+
-LGPL-2.1+: http://spdx.org/licenses/LGPL-2.1+
-MAME: see docs/license.txt