Mercurial > sdl-ios-xcode
comparison src/video/nanox/SDL_nxvideo.c @ 1341:d02b552e5304
Configure dynamically generates SDL_config.h
I'm still wrestling with autoheader, but this should work for now...
Fixed lots of build problems with C library support disabled
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 07 Feb 2006 12:11:33 +0000 |
parents | 604d73db6802 |
children | c71e05b4dc2e |
comparison
equal
deleted
inserted
replaced
1340:58b114ef50e7 | 1341:d02b552e5304 |
---|---|
66 static void NX_DeleteDevice (SDL_VideoDevice * device) | 66 static void NX_DeleteDevice (SDL_VideoDevice * device) |
67 { | 67 { |
68 Dprintf ("enter NX_DeleteDevice\n") ; | 68 Dprintf ("enter NX_DeleteDevice\n") ; |
69 | 69 |
70 if (device) { | 70 if (device) { |
71 if (device -> hidden) free (device -> hidden) ; | 71 if (device -> hidden) SDL_free (device -> hidden) ; |
72 if (device -> gl_data) free (device -> gl_data) ; | 72 if (device -> gl_data) SDL_free (device -> gl_data) ; |
73 free (device) ; | 73 SDL_free (device) ; |
74 } | 74 } |
75 | 75 |
76 Dprintf ("leave NX_DeleteDevice\n") ; | 76 Dprintf ("leave NX_DeleteDevice\n") ; |
77 } | 77 } |
78 | 78 |
254 NX_DestroyWindow (this, this -> screen) ; | 254 NX_DestroyWindow (this, this -> screen) ; |
255 if (FSwindow && FSwindow != GR_ROOT_WINDOW_ID) { | 255 if (FSwindow && FSwindow != GR_ROOT_WINDOW_ID) { |
256 GrDestroyWindow (FSwindow) ; | 256 GrDestroyWindow (FSwindow) ; |
257 } | 257 } |
258 NX_FreeVideoModes (this) ; | 258 NX_FreeVideoModes (this) ; |
259 free (GammaRamp_R) ; | 259 SDL_free (GammaRamp_R) ; |
260 free (GammaRamp_G) ; | 260 SDL_free (GammaRamp_G) ; |
261 free (GammaRamp_B) ; | 261 SDL_free (GammaRamp_B) ; |
262 | 262 |
263 #ifdef ENABLE_NANOX_DIRECT_FB | 263 #ifdef ENABLE_NANOX_DIRECT_FB |
264 if (Clientfb) | 264 if (Clientfb) |
265 GrCloseClientFramebuffer(); | 265 GrCloseClientFramebuffer(); |
266 #endif | 266 #endif |
304 NX_DestroyWindow (this, screen) ; | 304 NX_DestroyWindow (this, screen) ; |
305 } | 305 } |
306 | 306 |
307 // See if we have been given a window id | 307 // See if we have been given a window id |
308 if (SDL_windowid) { | 308 if (SDL_windowid) { |
309 SDL_Window = strtol (SDL_windowid, NULL, 0) ; | 309 SDL_Window = SDL_strtol (SDL_windowid, NULL, 0) ; |
310 } else { | 310 } else { |
311 SDL_Window = 0 ; | 311 SDL_Window = 0 ; |
312 } | 312 } |
313 | 313 |
314 if ( ! SDL_ReallocFormat (screen, bpp, SDL_Visual.red_mask, | 314 if ( ! SDL_ReallocFormat (screen, bpp, SDL_Visual.red_mask, |