← Back to branch summary

~ubuntu-branches/ubuntu/lucid/sdlmame/lucid

« back to all changes in this revision

Viewing changes to src/osd/sdl/sdlmain.c

  • Committer: Bazaar Package Importer
  • Author(s): Cesare Falco
  • Date: 2009-11-03 17:10:15 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20091103171015-6hop4ory5lxnumpn
Tags: 0.135-0ubuntu1
https://launchpad.net/bugs/403212
* New upstream release - Closes (LP: #403212)
* debian/watch: unstable releases are no longer detected
* mame.ini: added the cheat subdirectories to cheatpath so zipped
  cheatfiles will be searched too
* renamed crsshair subdirectory to crosshair to reflect upstream change
* mame.ini: renamed references to crosshair subdirectory (see above)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/osd/sdl/sdlmain.c
71
71
//  OPTIONS
72
72
//============================================================
73
73
 
74
 
static const options_entry mame_sdl_options[] =
75
 
{
 
74
#ifndef INI_PATH
76
75
#if defined(SDLMAME_WIN32) || defined(SDLMAME_MACOSX) || defined(SDLMAME_OS2)
77
 
        { "inipath",                              ".;ini",     0,                 "path to ini files" },
78
 
#else
79
 
#if defined(INI_PATH)
80
 
        { "inipath",                              INI_PATH,     0,                "path to ini files" },
 
76
        #define INI_PATH ".;ini"
81
77
#else
82
78
#ifdef MESS
83
 
        { "inipath",                              "$HOME/.mess;.;ini",     0,     "path to ini files" },
 
79
        #define INI_PATH "$HOME/.mess;.;ini"
84
80
#else
85
 
        { SDLOPTION_INIPATH,                     "$HOME/.mame;.;ini",     0,     "path to ini files" },
 
81
        #define INI_PATH "$HOME/.mame;.;ini"
86
82
#endif // MESS
 
83
#endif // MACOSX
87
84
#endif // INI_PATH
88
 
#endif // MACOSX
89
 
        
 
85
 
 
86
static const options_entry mame_sdl_options[] =
 
87
{
 
88
        { SDLOPTION_INIPATH,                     INI_PATH,     0,                "path to ini files" }, 
90
89
 
91
90
        // debugging options
92
91
        { NULL,                                   NULL,       OPTION_HEADER,     "DEBUGGING OPTIONS" },
447
446
        mame_printf_verbose("Build version:      %s\n", build_version);
448
447
        mame_printf_verbose("Build architecure:  ");
449
448
        MACRO_VERBOSE(SDLMAME_ARCH);
450
 
        MACRO_VERBOSE(DISTRO);
451
449
        mame_printf_verbose("\n");
452
 
        mame_printf_verbose("Build defines:      ");
 
450
        mame_printf_verbose("Build defines 1:    ");
453
451
        MACRO_VERBOSE(SDLMAME_UNIX);
454
452
        MACRO_VERBOSE(SDLMAME_X11);
455
453
        MACRO_VERBOSE(SDLMAME_WIN32);
458
456
        MACRO_VERBOSE(SDLMAME_DARWIN);
459
457
        MACRO_VERBOSE(SDLMAME_LINUX);
460
458
        MACRO_VERBOSE(SDLMAME_SOLARIS);
 
459
        MACRO_VERBOSE(SDLMAME_NOASM);
461
460
        MACRO_VERBOSE(SDLMAME_IRIX);
462
461
        MACRO_VERBOSE(SDLMAME_BSD);
 
462
        mame_printf_verbose("\n");
 
463
        mame_printf_verbose("Build defines 1:    ");
463
464
        MACRO_VERBOSE(LSB_FIRST);
464
465
        MACRO_VERBOSE(PTR64);
465
466
        MACRO_VERBOSE(MAME_DEBUG);
466
467
        MACRO_VERBOSE(NDEBUG);
467
468
        MACRO_VERBOSE(VODOO_DRC);
 
469
        MACRO_VERBOSE(DISTRO);
 
470
        MACRO_VERBOSE(SYNC_IMPLEMENTATION);
468
471
        mame_printf_verbose("\n");
469
472
        mame_printf_verbose("SDL/OpenGL defines: ");
470
473
        mame_printf_verbose("SDL_COMPILEDVERSION=%d ", SDL_COMPILEDVERSION);