folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

VIDEO: Fix build when using SDL vs SDL2

Browse source
This commit is contained in:
Mark Pizzolato 2015-02-05 09:58:40 -08:00
parent 7fe345c4c0
commit c9eb08c767
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sim_video.c
View file

@ -1128,6 +1128,7 @@ SDL_WarpMouseInWindow (NULL, vid_cursor_x, vid_cursor_y);
SDL_PumpEvents (); SDL_PumpEvents ();
} }
#if SDL_MAJOR_VERSION != 1
void vid_draw_region (SDL_UserEvent *event) void vid_draw_region (SDL_UserEvent *event)
{ {
SDL_Rect *vid_dst = (SDL_Rect *)event->data1; SDL_Rect *vid_dst = (SDL_Rect *)event->data1;
@ -1141,6 +1142,7 @@ if (SDL_UpdateTexture(vid_texture, vid_dst, buf, vid_dst->w*sizeof(*buf)))
free (vid_dst); free (vid_dst);
event->data1 = NULL; event->data1 = NULL;
} }
#endif
int vid_video_events (void) int vid_video_events (void)
{ {
@ -1447,10 +1449,12 @@ if (0) while (SDL_PeepEvents (&event, 1, SDL_GETEVENT, SD
if (event.user.code == EVENT_CLOSE) { if (event.user.code == EVENT_CLOSE) {
event.user.code = 0; /* Mark as done */ event.user.code = 0; /* Mark as done */
} }
#if SDL_MAJOR_VERSION != 1
if (event.user.code == EVENT_DRAW) { if (event.user.code == EVENT_DRAW) {
vid_draw_region ((SDL_UserEvent*)&event); vid_draw_region ((SDL_UserEvent*)&event);
event.user.code = 0; /* Mark as done */ event.user.code = 0; /* Mark as done */
} }
#endif
if (event.user.code == EVENT_SHOW) { if (event.user.code == EVENT_SHOW) {
vid_show_video_event (); vid_show_video_event ();
event.user.code = 0; /* Mark as done */ event.user.code = 0; /* Mark as done */