summaryrefslogtreecommitdiffstatshomepage
path: root/docs
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-03-04 11:04:29 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-03-04 11:04:29 +0100
commit35ccf865aa366845b574e1fdbc71c4866b3d6a0f (patch)
treeed3676e4aa5ebb07b61c22718c0870a977f430f8 /docs
parent5cef4e1f91010f0d573bbd662208979fa39e73ec (diff)
deleted old license and restrictions mentioned in mame.txt (nw)
Diffstat (limited to 'docs')
-rw-r--r--docs/mame.txt38
-rw-r--r--docs/mamelicense.txt40
2 files changed, 10 insertions, 68 deletions
diff --git a/docs/mame.txt b/docs/mame.txt
index b675d2145a3..bd9187b84f9 100644
--- a/docs/mame.txt
+++ b/docs/mame.txt
@@ -6,14 +6,14 @@ MAME is a trademark owned by Nicola Salmoria
----------
I. Purpose
----------
-MAME is strictly a non-profit project. Its main purpose is to be a
-reference to the inner workings of the emulated arcade machines. This is
-done both for educational purposes and for preservation purposes, in
-order to prevent many historical games from disappearing forever once the
-hardware they run on stops working. Of course, in order to preserve the
-games and demonstrate that the emulated behavior matches the original,
-you must also be able to actually play the games. This is considered a
-nice side effect, and is not MAME's primary focus.
+MAME main purpose is to be a refefence to the inner workings of
+the emulated arcade machines. This is done both for educational purposes
+and for preservation purposes, in order to prevent many historical games
+from disappearing forever once the hardware they run on stops working.
+Of course, in order to preserve the games and demonstrate that the
+emulated behavior matches the original, you must also be able to actually
+play the games. This is considered a nice side effect, and is not MAME's
+primary focus.
It is not our intention to infringe on any copyrights or patents on the
original games. All of MAME's source code is either our own or freely
@@ -26,7 +26,8 @@ executable.
--------
II. Cost
--------
-MAME is free. Its source code is free. Selling either is not allowed.
+MAME is free. Its source code is free. Project as whole is under GPL-2.0
+but most of code (including core functionality) is under BSD-3.
----------------
@@ -46,25 +47,6 @@ CD, or hard disk images.
--------------------
IV. Derivative Works
--------------------
-Derivative works are allowed under the MAME license. However, you are
-discouraged from providing specific functionality that goes against the
-philosophy of the MAME team. Specifically:
-
-* Do not add games which are more recent than 3 years old, or which are
-still being sold new by the company that produced them. MAME is not
-intended to be a platform that competes with arcade games that are still
-being actively sold.
-
-* Do not provide a means of generating a list of games that specifically
-identifies those games for which the user does not have image files. This
-only encourages users to seek out sources for illegal ROM, CD, and hard
-disk images in order to "complete" their collection.
-
-* Do not remove the startup screen that contains information about why
-certain non-working games don't work. This only serves to generate a
-bunch of useless email traffic to the developers asking why the games
-don't work.
-
Because the name MAME is trademarked, you must abide by the rules of the
trademark usage if you wish to use "MAME" as part of the name your
derivative work. In general, this means you must request permission,
diff --git a/docs/mamelicense.txt b/docs/mamelicense.txt
deleted file mode 100644
index 31f5d897dd3..00000000000
--- a/docs/mamelicense.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-The MAME project, as a whole, is currently released under the following
-license, known as the MAME License.
-
-Most code in MAME is under a more permissive license, or dual-licensed.
-This is noted in per-file headers which specify the alternate license.
-
-The text of the MAME License follows.
-
-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.