Compile in RSound for Win32 as well.

This commit is contained in:
Themaister 2011-01-29 23:53:38 +01:00
parent 8ba639c7d5
commit 2ff47ab7c4
2 changed files with 11 additions and 4 deletions

View File

@ -11,6 +11,7 @@ HAVE_SDL = 1
HAVE_XML = 1 HAVE_XML = 1
HAVE_FREETYPE = 1 HAVE_FREETYPE = 1
HAVE_XAUDIO = 1 HAVE_XAUDIO = 1
HAVE_RSOUND = 1
libsnes ?= -lsnes libsnes ?= -lsnes
LIBS = LIBS =
@ -37,6 +38,12 @@ ifeq ($(HAVE_XAUDIO), 1)
DEFINES += -DHAVE_XAUDIO DEFINES += -DHAVE_XAUDIO
endif endif
ifeq ($(HAVE_RSOUND), 1)
OBJ += audio/rsound.o
DEFINES += -DHAVE_RSOUND
LIBS += -lrsound
endif
ifeq ($(HAVE_XML), 1) ifeq ($(HAVE_XML), 1)
OBJ += gfx/shader_glsl.o OBJ += gfx/shader_glsl.o
DEFINES += $(XML_CFLAGS) -DHAVE_XML DEFINES += $(XML_CFLAGS) -DHAVE_XML

View File

@ -69,16 +69,16 @@
#define AUDIO_DEFAULT_DRIVER AUDIO_OSS #define AUDIO_DEFAULT_DRIVER AUDIO_OSS
#elif defined(HAVE_JACK) #elif defined(HAVE_JACK)
#define AUDIO_DEFAULT_DRIVER AUDIO_JACK #define AUDIO_DEFAULT_DRIVER AUDIO_JACK
#elif defined(HAVE_RSOUND)
#define AUDIO_DEFAULT_DRIVER AUDIO_RSOUND
#elif defined(HAVE_ROAR)
#define AUDIO_DEFAULT_DRIVER AUDIO_ROAR
#elif defined(HAVE_AL) #elif defined(HAVE_AL)
#define AUDIO_DEFAULT_DRIVER AUDIO_AL #define AUDIO_DEFAULT_DRIVER AUDIO_AL
#elif defined(HAVE_SDL) #elif defined(HAVE_SDL)
#define AUDIO_DEFAULT_DRIVER AUDIO_SDL #define AUDIO_DEFAULT_DRIVER AUDIO_SDL
#elif defined(HAVE_XAUDIO) #elif defined(HAVE_XAUDIO)
#define AUDIO_DEFAULT_DRIVER AUDIO_XAUDIO #define AUDIO_DEFAULT_DRIVER AUDIO_XAUDIO
#elif defined(HAVE_RSOUND)
#define AUDIO_DEFAULT_DRIVER AUDIO_RSOUND
#elif defined(HAVE_ROAR)
#define AUDIO_DEFAULT_DRIVER AUDIO_ROAR
#else #else
#error Need at least one audio driver! #error Need at least one audio driver!
#endif #endif