diff options
author | 2015-04-04 15:05:21 +1100 | |
---|---|---|
committer | 2015-04-04 15:05:21 +1100 | |
commit | a119fc50ab75011c4c8f6d5980cfac3767c4a73a (patch) | |
tree | 7dcf324163e162f1d473efc27e65ee044ca247a8 | |
parent | 4cd434246dd203d622d1b3c74050588a514907e4 (diff) |
Remove some obsolete code, enable MALLOC_DEBUG for SDLWin32
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 4 | ||||
-rw-r--r-- | src/osd/sdl/main.c | 19 | ||||
-rw-r--r-- | src/osd/sdl/sdlmain.c | 7 |
3 files changed, 4 insertions, 26 deletions
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 775398f87a6..4b9a18b6f24 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -105,6 +105,10 @@ if _OPTIONS["targetos"]=="windows" then "main=utf8_main", } + configuration { "Debug" } + defines { + "MALLOC_DEBUG", + } configuration { "vs*" } includedirs { path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include") diff --git a/src/osd/sdl/main.c b/src/osd/sdl/main.c index da27c9ba9ba..f3ccb07f83d 100644 --- a/src/osd/sdl/main.c +++ b/src/osd/sdl/main.c @@ -37,14 +37,6 @@ extern "C" int _tmain(int argc, TCHAR **argv) int i, rc; 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 */ utf8_argv = (char **) malloc(argc * sizeof(*argv)); if (utf8_argv == NULL) @@ -64,16 +56,5 @@ extern "C" int _tmain(int argc, TCHAR **argv) osd_free(utf8_argv[i]); 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; } diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c index 927facfd175..881fe0ff248 100644 --- a/src/osd/sdl/sdlmain.c +++ b/src/osd/sdl/sdlmain.c @@ -290,13 +290,6 @@ int main(int argc, char *argv[]) res = frontend.execute(argc, argv); } -#ifdef MALLOC_DEBUG - { - void check_unfreed_mem(void); - check_unfreed_mem(); - } -#endif - #ifdef SDLMAME_UNIX #if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN)) if (!sdl_entered_debugger) |