mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 14:52:43 +00:00
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
This commit is contained in:
parent
2aa6acd974
commit
b3372bc0d0
3
configure
vendored
3
configure
vendored
@ -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`
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user