From 43c5576268f6737fab4f9c0e9e33acdb55cd5c63 Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Thu, 22 Mar 2012 17:21:28 +0100 Subject: [PATCH] Remove warning in autotools and make LOVE_OLD_MODPLUG define that disables some new modplug settings --- platform/unix/gen-makefile | 1 - src/modules/sound/lullaby/ModPlugDecoder.cpp | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/unix/gen-makefile b/platform/unix/gen-makefile index 8dc6e4c57..62fdede59 100644 --- a/platform/unix/gen-makefile +++ b/platform/unix/gen-makefile @@ -6,7 +6,6 @@ inc_modules="$inc_current/modules" inc_libraries="$inc_current/libraries" echo "AM_CPPFLAGS = -I$inc_current -I$inc_modules -I$inc_libraries -I/usr/include/AL -I/usr/include/freetype2 \$(INCLUDE_LUA) -I/usr/include/SDL \$(FILE_OFFSET) AUTOMAKE_OPTIONS = subdir-objects -DEFAULT_INCLUDES = SUBDIRS = # LÖVE executable diff --git a/src/modules/sound/lullaby/ModPlugDecoder.cpp b/src/modules/sound/lullaby/ModPlugDecoder.cpp index 2ad72d63b..02f0a70bf 100644 --- a/src/modules/sound/lullaby/ModPlugDecoder.cpp +++ b/src/modules/sound/lullaby/ModPlugDecoder.cpp @@ -42,8 +42,12 @@ namespace lullaby // fill with modplug defaults (modplug _memsets_, so we could get // garbage settings when the struct is only partially initialized) // This does not exist yet on Windows. + + // Some settings not supported by some older versions +#ifndef LOVE_OLD_MODPLUG settings.mStereoSeparation = 128; settings.mMaxMixChannels = 32; +#endif settings.mReverbDepth = 0; settings.mReverbDelay = 0; settings.mBassAmount = 0;