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

« back to all changes in this revision

Viewing changes to src/osd/sdl/osdsdl.h

  • 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
* 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:
210
210
#else
211
211
#define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
212
212
#endif
213
 
                         
 
213
 
214
214
#if defined(SDLMAME_WIN32)
215
 
#if (SDL_VERSION_ATLEAST(1,3,0))
216
 
#define SDLMAME_INIT_IN_WORKER_THREAD (0) //FIXME: breaks mt
217
 
#define SDL13_COMBINE_RESIZE (1)
218
 
#else
219
 
#define SDLMAME_INIT_IN_WORKER_THREAD (1)
220
 
#define SDL13_COMBINE_RESIZE (0)
221
 
#endif
222
 
#else
223
 
#define SDL13_COMBINE_RESIZE (0)
224
 
#define SDLMAME_INIT_IN_WORKER_THREAD (0)
 
215
        #if (SDL_VERSION_ATLEAST(1,3,0))
 
216
                #define SDLMAME_INIT_IN_WORKER_THREAD   (0) //FIXME: breaks mt
 
217
                #define SDL13_COMBINE_RESIZE (1)
 
218
        #else
 
219
                #define SDLMAME_INIT_IN_WORKER_THREAD   (1)
 
220
                #define SDL13_COMBINE_RESIZE (0)
 
221
        #endif
 
222
#else
 
223
        #define SDL13_COMBINE_RESIZE (0)
 
224
        #define SDLMAME_INIT_IN_WORKER_THREAD   (0)
225
225
#endif
226
226
 
227
 
#if defined(SDLMAME_NO_X11) || defined(SDLMAME_WIN32)
 
227
#if defined(NO_DEBUGGER)
228
228
#define SDLMAME_HAS_DEBUGGER                    (0)
229
229
#else
230
230
#define SDLMAME_HAS_DEBUGGER                    (1)