Mercurial > mplayer.hg

diff mplayer.c @ 30136:dc1d66a20ec2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Sun, 03 Jan 2010 11:33:33 +0000
parents 728444c29ec0
children b7bb4a899a6b
line wrap: on
line diff
--- a/mplayer.c	Sun Jan 03 09:20:01 2010 +0000
+++ b/mplayer.c	Sun Jan 03 11:33:33 2010 +0000
@@ -1163,8 +1163,12 @@
  * 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