update license in source code itself

diff --git a/config_file.c b/config_file.c
index 4fbc36a..6632aa5 100644 (file)
--- a/config_file.c
+++ b/config_file.c
@@ -5,6 +5,7 @@
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 

diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c
index 14c823d..4c6b833 100644 (file)
--- a/gp2x/in_gp2x.c
+++ b/gp2x/in_gp2x.c
@@ -1,3 +1,14 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2006-2012
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,7 +23,7 @@
 #define IN_GP2X_PREFIX "gp2x:"
 #define IN_GP2X_NBUTTONS 32
 
-/* note: in_gp2x hadles combos (if 2 btns have the same bind,
+/* note: in_gp2x handles combos (if 2 btns have the same bind,
  * both must be pressed for action to happen) */
 static int in_gp2x_combo_keys = 0;
 static int in_gp2x_combo_acts = 0;

diff --git a/gp2x/soc.c b/gp2x/soc.c
index 43ebd85..3d4ad04 100644 (file)
--- a/gp2x/soc.c
+++ b/gp2x/soc.c
@@ -1,3 +1,14 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2009-2010
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>

diff --git a/gp2x/soc_dummy.c b/gp2x/soc_dummy.c
index 89b1d71..21aef2a 100644 (file)
--- a/gp2x/soc_dummy.c
+++ b/gp2x/soc_dummy.c
@@ -1,3 +1,14 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2009,2010
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
 /* dummy code for qemu testing, etc */
 #include <stdlib.h>
 

diff --git a/gp2x/soc_mmsp2.c b/gp2x/soc_mmsp2.c
index e2a2f1d..ee933d4 100644 (file)
--- a/gp2x/soc_mmsp2.c
+++ b/gp2x/soc_mmsp2.c
@@ -1,3 +1,14 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2006-2012
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/gp2x/soc_pollux.c b/gp2x/soc_pollux.c
index 6a6dde0..39f8955 100644 (file)
--- a/gp2x/soc_pollux.c
+++ b/gp2x/soc_pollux.c
@@ -1,4 +1,13 @@
 /*
+ * (C) Gražvydas "notaz" Ignotas, 2009-2010
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ *
  * <random_info=mem_map>
  * 00000000-029fffff linux (42MB)
  * 02a00000-02dfffff fb (4MB, 153600B really used)
@@ -6,6 +15,7 @@
  * 03000000-03ffffff MPEGDEC (?, 16MB)
  * </random_info>
  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/in_sdl.c b/in_sdl.c
index ce57536..0ba1d05 100644 (file)
--- a/in_sdl.c
+++ b/in_sdl.c
@@ -5,6 +5,7 @@
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 

diff --git a/input.c b/input.c
index 39d6783..3881858 100644 (file)
--- a/input.c
+++ b/input.c
@@ -5,6 +5,7 @@
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 

diff --git a/linux/fbdev.c b/linux/fbdev.c
index ec3d5c7..0718861 100644 (file)
--- a/linux/fbdev.c
+++ b/linux/fbdev.c
@@ -5,6 +5,7 @@
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 

diff --git a/linux/host_dasm.c b/linux/host_dasm.c
index a63a9ac..d35bc9f 100644 (file)
--- a/linux/host_dasm.c
+++ b/linux/host_dasm.c
@@ -1,3 +1,14 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2009-2010
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,7 +22,7 @@ extern char **g_argv;
 
 static struct disassemble_info di;
 
-#ifdef ARM
+#ifdef __arm__
 #define print_insn_func print_insn_little_arm
 #define BFD_ARCH bfd_arch_arm
 #define BFD_MACH bfd_mach_arm_4T

diff --git a/linux/in_evdev.c b/linux/in_evdev.c
index f06f495..3f30970 100644 (file)
--- a/linux/in_evdev.c
+++ b/linux/in_evdev.c
@@ -1,10 +1,11 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2008-2010
+ * (C) Gražvydas "notaz" Ignotas, 2008-2012
  *
  * This work is licensed under the terms of any of these licenses
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 

diff --git a/linux/plat.c b/linux/plat.c
index f793910..1f2c9f2 100644 (file)
--- a/linux/plat.c
+++ b/linux/plat.c
@@ -1,10 +1,11 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2008-2010
+ * (C) Gražvydas "notaz" Ignotas, 2008-2012
  *
  * This work is licensed under the terms of any of these licenses
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 

diff --git a/linux/sndout_oss.c b/linux/sndout_oss.c
index 9e959ef..0df17b2 100644 (file)
--- a/linux/sndout_oss.c
+++ b/linux/sndout_oss.c
@@ -1,3 +1,14 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2009-2010
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
 /* sound output via OSS */
 #include <stdio.h>
 #include <sys/types.h>

diff --git a/linux/xenv.c b/linux/xenv.c
index 40bf92c..94e1c50 100644 (file)
--- a/linux/xenv.c
+++ b/linux/xenv.c
@@ -5,6 +5,7 @@
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 

diff --git a/menu.c b/menu.c
index 63a9943..b2ab30e 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -5,6 +5,7 @@
  * (at your option):\r
  *  - GNU GPL, version 2 or later.\r
  *  - GNU LGPL, version 2.1 or later.\r
+ *  - MAME license.\r
  * See the COPYING file in the top-level directory.\r
  */\r
 \r

diff --git a/readpng.c b/readpng.c
index cad1217..a697deb 100644 (file)
--- a/readpng.c
+++ b/readpng.c
@@ -5,6 +5,7 @@
  * (at your option):
  *  - GNU GPL, version 2 or later.
  *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 

diff --git a/win32/direct.cpp b/win32/direct.cpp
index 3d0738c..1d6270f 100644 (file)
--- a/win32/direct.cpp
+++ b/win32/direct.cpp
@@ -1,4 +1,14 @@
-// ddraw\r
+/*\r
+ * (C) Gražvydas "notaz" Ignotas, 2009\r
+ *\r
+ * This work is licensed under the terms of any of these licenses\r
+ * (at your option):\r
+ *  - GNU GPL, version 2 or later.\r
+ *  - GNU LGPL, version 2.1 or later.\r
+ *  - MAME license.\r
+ * See the COPYING file in the top-level directory.\r
+ */\r
+\r
 #include <ddraw.h>\r
 #include "../lprintf.h"\r
 #include "direct.h"\r

diff --git a/win32/dsnd.cpp b/win32/dsnd.cpp
index 974b3b2..ce1fd44 100644 (file)
--- a/win32/dsnd.cpp
+++ b/win32/dsnd.cpp
@@ -1,4 +1,14 @@
-//#pragma warning (disable:4201)\r
+/*\r
+ * (C) Gražvydas "notaz" Ignotas, 2009\r
+ *\r
+ * This work is licensed under the terms of any of these licenses\r
+ * (at your option):\r
+ *  - GNU GPL, version 2 or later.\r
+ *  - GNU LGPL, version 2.1 or later.\r
+ *  - MAME license.\r
+ * See the COPYING file in the top-level directory.\r
+ */\r
+\r
 #include <stdlib.h>\r
 #define WIN32_LEAN_AND_MEAN\r
 #include <windows.h>\r

diff --git a/win32/in_vk.c b/win32/in_vk.c
index f114f74..ae8888a 100644 (file)
--- a/win32/in_vk.c
+++ b/win32/in_vk.c
@@ -1,3 +1,14 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2009
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
 #define RC_INVOKED // we only need defines
 #include <winuser.h>
 #undef RC_INVOKED