summaryrefslogtreecommitdiffstats
path: root/mplayer.c
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 /mplayer.c
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 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index ef11a39e4e..ca0bc02f34 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1163,8 +1163,12 @@ void init_vo_spudec(void) {
* will be done automatically by replacing our main() if we include SDL.h.
*/
#if defined(__APPLE__) && defined(CONFIG_SDL)
+#ifdef CONFIG_SDL_SDL_H
+#include <SDL/SDL.h>
+#else
#include <SDL.h>
#endif
+#endif
/**
* \brief append a formatted string