# HG changeset patch # User Matti Hamalainen # Date 1350296880 -10800 # Node ID 230cc7c6564df33acf54d0363179552842ea1532 # Parent d4802335cbbc6f1776371eb19bc89a77ebc886d7 Rename DM_DEBUG compile time define to DM_DEVEL, for development mode. diff -r d4802335cbbc -r 230cc7c6564d Makefile.gen --- a/Makefile.gen Mon Oct 15 13:17:12 2012 +0300 +++ b/Makefile.gen Mon Oct 15 13:28:00 2012 +0300 @@ -4,7 +4,7 @@ include config.mak ifeq ($(EXTRA_CFLAGS),) -EXTRA_CFLAGS=-march=core2 -DDM_DEBUG +EXTRA_CFLAGS=-march=core2 -DDM_DEVEL endif ifneq ($(DMLIB),) diff -r d4802335cbbc -r 230cc7c6564d dmsimple.c --- a/dmsimple.c Mon Oct 15 13:17:12 2012 +0300 +++ b/dmsimple.c Mon Oct 15 13:28:00 2012 +0300 @@ -18,8 +18,8 @@ { 0, '?', "help", "Show this help", OPT_NONE }, { 1, 'v', "verbose", "Be more verbose", OPT_NONE }, { 2, 'f', "fs", "Fullscreen", OPT_NONE }, -#ifdef DM_DEBUG - { 3, 'd', "debug", "Debug mode", OPT_NONE }, +#ifdef DM_DEVEL + { 3, 'd', "devel", "Development mode", OPT_NONE }, #endif }; @@ -53,7 +53,7 @@ engine.optVFlags |= SDL_FULLSCREEN; break; -#ifdef DM_DEBUG +#ifdef DM_DEVEL case 3: engine.optDebug = TRUE; break; @@ -348,7 +348,7 @@ } -#if defined(DM_DEBUG) && defined(DM_USE_JSS) +#if defined(DM_DEVEL) && defined(DM_USE_JSS) static void engineAudioCallbackDebug(void *userdata, Uint8 *stream, int len) { if (engine.paused) @@ -374,7 +374,7 @@ void engineAdjustTime(int adj) { -#ifdef DM_DEBUG +#ifdef DM_DEVEL if (engine.optDebug) { int tmp = engine.adjustTime + adj; @@ -556,7 +556,7 @@ dmPrint(1, "Trying to init SDL audio with: fmt=%d, chn=%d, freq=%d\n", engine.optAfmt.format, engine.optAfmt.channels, engine.optAfmt.freq); -#if defined(DM_DEBUG) && defined(DM_USE_JSS) +#if defined(DM_DEVEL) && defined(DM_USE_JSS) if (engine.optDebug) engine.optAfmt.callback = engineAudioCallbackDebug; else @@ -604,7 +604,7 @@ if ((err = engine.demoInit()) != DMERR_OK) goto error_exit; -#if defined(DM_DEBUG) && defined(DM_USE_JSS) +#if defined(DM_DEVEL) && defined(DM_USE_JSS) if (engine.optDebug) { Uint8 *ptr; @@ -656,7 +656,7 @@ engine.pauseFlag = !engine.pauseFlag; break; -#ifdef DM_DEBUG +#ifdef DM_DEVEL case SDLK_LEFT: engineAdjustTime(-500); break; case SDLK_RIGHT: engineAdjustTime( 500); break; case SDLK_UP: engineAdjustTime( 1000); break;