Changeset 115

Show
Ignore:
Timestamp:
05/06/07 12:29:26 (2 years ago)
Author:
takkaria
Message:

Allow the SDL port to compile on Windows.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/main-win.c

    r82 r115  
    7575#define uint unsigned int 
    7676 
    77 #ifdef WINDOWS 
     77#if (defined(WINDOWS) && !defined(USE_SDL)) 
    7878 
    7979 
  • trunk/src/main.c

    r85 r115  
    1818 
    1919 
    20 #if defined(WIN32_CONSOLE_MODE) || (!defined(MACINTOSH) && !defined(WINDOWS) && !defined(RISCOS)) 
     20#if defined(WIN32_CONSOLE_MODE) \ 
     21    || (!defined(MACINTOSH) && !defined(WINDOWS) && !defined(RISCOS)) \ 
     22    || defined(USE_SDL) 
    2123 
    2224#include "main.h" 
     
    2830static const struct module modules[] = 
    2931{ 
     32#ifdef USE_SDL 
     33        { "sdl", help_sdl, init_sdl }, 
     34#endif /* USE_SDL */ 
     35 
    3036#ifdef USE_GTK 
    3137        { "gtk", help_gtk, init_gtk }, 
     
    8389        { "lfb", help_lfb, init_lfb }, 
    8490#endif /* USE_LFB */ 
    85          
    86 #ifdef USE_SDL 
    87         { "sdl", help_sdl, init_sdl }, 
    88 #endif /* USE_SDL */ 
    8991}; 
    9092 
     
    315317 
    316318        bool done = FALSE; 
    317  
    318319        bool new_game = FALSE; 
    319320 
    320321        int show_score = 0; 
    321322 
    322         cptr mstr = NULL; 
     323        const char *mstr = NULL; 
    323324 
    324325        bool args = TRUE;