summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-03 11:33:33 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-03 11:33:33 +0000
commitc23a01e2600ec77f857bcfb3459a9138baea8aff (patch)
treec613b5cb45d33606b0f850a52f2a5ba6502f374e /libao2
parent485b17cc7d419336c0244ab2594a0c00c16eec87 (diff)
downloadmpv-c23a01e2600ec77f857bcfb3459a9138baea8aff.tar.bz2
mpv-c23a01e2600ec77f857bcfb3459a9138baea8aff.tar.xz
Fixup SDL configure check:
- Make it work without sdl-config which adds at least useless or even hurtful cflags and also does not work for cross-compiling - If using sdl-config, make it use the CFLAGS we actually use for compiling instead of something else. Thus #undef main is needed in the test program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_sdl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 329486b272..8df8c0ccf2 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -31,7 +31,11 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "libaf/af_format.h"
+#ifdef CONFIG_SDL_SDL_H
+#include <SDL/SDL.h>
+#else
#include <SDL.h>
+#endif
#include "osdep/timer.h"
#include "libavutil/fifo.h"