Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove some obsolete code, enable MALLOC_DEBUG for SDLWin32

Browse Source
This commit is contained in:
Vas Crabb 2015-04-04 15:05:21 +11:00
parent 4cd434246d
commit a119fc50ab
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/src/osd/sdl_cfg.lua
View File

@ -105,6 +105,10 @@ if _OPTIONS["targetos"]=="windows" then
"main=utf8_main", "main=utf8_main",
} }
configuration { "Debug" }
defines {
"MALLOC_DEBUG",
}
configuration { "vs*" } configuration { "vs*" }
includedirs { includedirs {
path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include") path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include")

19
src/osd/sdl/main.c
View File

@ -37,14 +37,6 @@ extern "C" int _tmain(int argc, TCHAR **argv)
int i, rc; int i, rc;
char **utf8_argv; char **utf8_argv;
#ifdef OSD_SDL
#ifdef MALLOC_DEBUG
{
extern int winalloc_in_main_code;
winalloc_in_main_code = TRUE;
#endif
#endif
/* convert arguments to UTF-8 */ /* convert arguments to UTF-8 */
utf8_argv = (char **) malloc(argc * sizeof(*argv)); utf8_argv = (char **) malloc(argc * sizeof(*argv));
if (utf8_argv == NULL) if (utf8_argv == NULL)
@ -64,16 +56,5 @@ extern "C" int _tmain(int argc, TCHAR **argv)
osd_free(utf8_argv[i]); osd_free(utf8_argv[i]);
free(utf8_argv); free(utf8_argv);
#ifdef OSD_SDL
#ifdef MALLOC_DEBUG
{
void check_unfreed_mem(void);
check_unfreed_mem();
}
winalloc_in_main_code = FALSE;
}
#endif
#endif
return rc; return rc;
} }

7
src/osd/sdl/sdlmain.c
View File

@ -290,13 +290,6 @@ int main(int argc, char *argv[])
res = frontend.execute(argc, argv); res = frontend.execute(argc, argv);
} }
#ifdef MALLOC_DEBUG
{
void check_unfreed_mem(void);
check_unfreed_mem();
}
#endif
#ifdef SDLMAME_UNIX #ifdef SDLMAME_UNIX
#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN)) #if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN))
if (!sdl_entered_debugger) if (!sdl_entered_debugger)