diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-03-13 16:25:08 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-03-13 16:25:08 +0000 |
| commit | b3372bc0d0b5ea0bfa4c77c41850e483e97beb16 (patch) | |
| tree | 20f42a332c037dfdc41a8f9faf0294818c2d06ec | |
| parent | 2aa6acd9747aec7f72ebea2addb9cdba98846d7a (diff) | |
| download | mpv-b3372bc0d0b5ea0bfa4c77c41850e483e97beb16.tar.bz2 mpv-b3372bc0d0b5ea0bfa4c77c41850e483e97beb16.tar.xz | |
fix compilation with sdl on mingw patch by Nehal <nehalmistry at gmx.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12020 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libao2/ao_sdl.c | 8 | ||||
| -rw-r--r-- | libvo/vo_sdl.c | 4 |
3 files changed, 11 insertions, 4 deletions
@@ -3626,6 +3626,9 @@ if test "$_sdl" = yes ; then if cygwin ; then _ld_sdl=`$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/` _inc_sdl=`$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/` + elif mingw32 ; then + _ld_sdl=`$_sdlconfig --libs | sed s/-mwindows//` + _inc_sdl=`$_sdlconfig --cflags | sed s/-Dmain=SDL_main//` else _ld_sdl=`$_sdlconfig --libs` _inc_sdl=`$_sdlconfig --cflags` diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c index a461a7488c..7c9da50680 100644 --- a/libao2/ao_sdl.c +++ b/libao2/ao_sdl.c @@ -34,7 +34,11 @@ static ao_info_t info = LIBAO_EXTERN(sdl) // Samplesize used by the SDLlib AudioSpec struct +#ifdef WIN32 +#define SAMPLESIZE 2048 +#else #define SAMPLESIZE 1024 +#endif // General purpose Ring-buffering routines @@ -95,8 +99,8 @@ static int read_buffer(unsigned char* data,int len){ // end ring buffer stuff -#if defined(HPUX) || defined(sgi) || (defined(sun) && defined(__svr4__)) -/* setenv is missing on solaris, IRIX and HPUX */ +#if defined(WIN32) || defined(HPUX) || defined(sgi) || (defined(sun) && defined(__svr4__)) +/* setenv is missing on win32, solaris, IRIX and HPUX */ static void setenv(const char *name, const char *val, int _xx) { int len = strlen(name) + strlen(val) + 2; diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 55814bfd19..fc992d91d5 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -139,8 +139,8 @@ LIBVO_EXTERN(sdl) #include <SDL.h> //#include <SDL/SDL_syswm.h> -#if defined(HPUX) || defined(sgi) || (defined(sun) && defined(__svr4__)) -/* setenv is missing on solaris, IRIX and HPUX */ +#if defined(WIN32) || defined(HPUX) || defined(sgi) || (defined(sun) && defined(__svr4__)) +/* setenv is missing on win32, solaris, IRIX and HPUX */ static void setenv(const char *name, const char *val, int _xx) { int len = strlen(name) + strlen(val) + 2; |