diff options
| author | Jesse Hall <jessehall@google.com> | 2012-07-23 14:50:38 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-23 14:50:39 -0700 |
| commit | a42f5af0f706d7c7fc8e6527c905c79b5298058e (patch) | |
| tree | 17e69c05e560cf2b3869c7f9c98aac220153ee29 | |
| parent | d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6 (diff) | |
| parent | 3cee084cdc822249fd535b6c02c7112f63848c4d (diff) | |
| download | external_qemu-a42f5af0f706d7c7fc8e6527c905c79b5298058e.zip external_qemu-a42f5af0f706d7c7fc8e6527c905c79b5298058e.tar.gz external_qemu-a42f5af0f706d7c7fc8e6527c905c79b5298058e.tar.bz2 | |
Merge "Remove link dependency on SDL_audio.c which we don't build"
| -rw-r--r-- | distrib/sdl-1.2.15/src/video/SDL_video.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/distrib/sdl-1.2.15/src/video/SDL_video.c b/distrib/sdl-1.2.15/src/video/SDL_video.c index 43c1826..f4f4407 100644 --- a/distrib/sdl-1.2.15/src/video/SDL_video.c +++ b/distrib/sdl-1.2.15/src/video/SDL_video.c @@ -1689,8 +1689,9 @@ void SDL_GL_Unlock() #endif } - +#if SDL_AUDIO_DRIVER_PULSE void SDL_Audio_SetCaption(const char *caption); +#endif /* * Sets/Gets the title and icon text of the display window, if any. @@ -1718,8 +1719,10 @@ void SDL_WM_SetCaption (const char *title, const char *icon) } } +#if SDL_AUDIO_DRIVER_PULSE /* PulseAudio can make use of this information. */ SDL_Audio_SetCaption(title); +#endif } void SDL_WM_GetCaption (char **title, char **icon) |