Browse Source

M.A.M.E goes to GPL, enable it for default

louyihua 8 years ago
parent
commit
932a3f131a
2 changed files with 2 additions and 4 deletions
  1. 1 1
      common.h
  2. 1 3
      sdlpal.cfg.example

+ 1 - 1
common.h

@@ -289,7 +289,7 @@ extern "C"
 
 #define PAL_HAS_MP3           1   /* Try always enable MP3. If compilation/run failed, please change this value to 0. */
 #define PAL_HAS_OGG           1   /* Try always enable OGG. If compilation/run failed, please change this value to 0. */
-#define PAL_HAS_MAME          1   /* Should not be enabled for now, until M.A.M.E goes open source licenses */
+#define PAL_HAS_MAME          1   /* Use M.A.M.E */
 
 #ifndef SDL_INIT_CDROM
 #define SDL_INIT_CDROM        0	  /* Compatibility with SDL 1.2 */

+ 1 - 3
sdlpal.cfg.example

@@ -42,9 +42,7 @@
 
 # OPL: Indicates which type of opl emulator to use. Valid types include 'DOSBOX'
 #      (default) and 'MAME'.  'DOSBOX' means use the opl emulator from dosbox
-#      project, while 'MAME' means use the opl emulator from M.A.M.E project (due
-#      to license issues, this option currently is only for testing purpose and can
-#      only be enabled when complied with a special macro definition.)
+#      project, while 'MAME' means use the opl emulator from M.A.M.E project.
 #OPL=DOSBOX
 
 # Stereo: Indicates whether to use mono audio or stereo audio. Non-zero means to use