From 7b75361c61006c84a70061381b843d72d3bd654e Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Mon, 15 Oct 2007 13:26:45 +0000
Subject: [PATCH] Set defines for USE_SDLMIXER to fix issues while compiling

---
 CHANGELOG.txt    | 4 ++++
 libmve/mveplay.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5c728688b..6193d89e4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20071015
+--------
+libmve/mveplay.c: Set defines for USE_SDLMIXER to fix issues while compiling
+
 20071014
 --------
 d2x.ini, arch/sdl/digi_audio.c, arch/sdl/digi_mixer.c, arch/sdl/digi_mixer_music.c, arch/sdl/jukebox.c, include/args.h, include/physfsx.h, main/game.h, main/inferno.c, main/args.c: Set SOUND_BUFFER_SIZE for SDL_mixer to 1024 to minimize delay; Removed MIDI-existance check and store all music to Music/ subdirectory of writedir - keeps clean if user has tons of levels; Added SDL_mixer command-line help output; Reworked PHYSFSX_init and removed SysUserDir so we can finally read args without a hassle; Stored MAXIMUM_FPS in game.h - where it belongs to
diff --git a/libmve/mveplay.c b/libmve/mveplay.c
index d273bba0b..d0a6721d4 100644
--- a/libmve/mveplay.c
+++ b/libmve/mveplay.c
@@ -28,7 +28,9 @@
 
 #if defined(AUDIO)
 #include <SDL/SDL.h>
+#ifdef USE_SDLMIXER
 #include <SDL/SDL_mixer.h>
+#endif
 #include "digi.h"
 #endif
 
@@ -426,6 +428,7 @@ static int audio_data_handler(unsigned char major, unsigned char minor, unsigned
 {
 #ifdef AUDIO
 
+#ifdef USE_SDLMIXER
 	// MD2211: for audio conversion
 	SDL_AudioCVT cvt;
 	int clen;
@@ -433,6 +436,7 @@ static int audio_data_handler(unsigned char major, unsigned char minor, unsigned
 	Uint16 out_format;
 	int out_channels;
 	// end MD2211
+#endif
 
 	static const int selected_chan=1;
 	int chan;