From a79a53fc899a3c7e6baa06f9cb9d09c5bac064d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 22 Mar 2006 17:13:32 +0000 Subject: [PATCH] gst/modplug/libmodplug/: Try that again (not only should it be MODPLUG_ instead of MODFILE, also that define is alrea... Original commit message from CVS: * gst/modplug/libmodplug/Makefile.am: * gst/modplug/libmodplug/load_it.cpp: Try that again (not only should it be MODPLUG_ instead of MODFILE, also that define is already set in stdafx.h; what we really need is some more #ifndefs). --- ChangeLog | 8 ++++++++ gst/modplug/libmodplug/Makefile.am | 2 +- gst/modplug/libmodplug/load_it.cpp | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 77728b6586..6a7522d404 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-03-22 Tim-Philipp Müller + + * gst/modplug/libmodplug/Makefile.am: + * gst/modplug/libmodplug/load_it.cpp: + Try that again (not only should it be MODPLUG_ instead + of MODFILE, also that define is already set in stdafx.h; + what we really need is some more #ifndefs). + 2006-03-22 Tim-Philipp Müller * gst/modplug/libmodplug/Makefile.am: diff --git a/gst/modplug/libmodplug/Makefile.am b/gst/modplug/libmodplug/Makefile.am index f5cb339143..b900a60d36 100644 --- a/gst/modplug/libmodplug/Makefile.am +++ b/gst/modplug/libmodplug/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libmodplug.la -libmodplug_la_CXXFLAGS = $(GST_CFLAGS) -D_REENTRANT -DMODFILE_NO_FILESAVE +libmodplug_la_CXXFLAGS = $(GST_CFLAGS) -D_REENTRANT libmodplug_la_LDFLAGS = -module -avoid-version libmodplug_la_SOURCES = tables.cpp \ sndmix.cpp \ diff --git a/gst/modplug/libmodplug/load_it.cpp b/gst/modplug/libmodplug/load_it.cpp index 29ea0d242d..d6222e9254 100644 --- a/gst/modplug/libmodplug/load_it.cpp +++ b/gst/modplug/libmodplug/load_it.cpp @@ -1290,6 +1290,7 @@ void ITUnpack16Bit(signed char *pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dw } } +#ifndef MODPLUG_NO_FILESAVE UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate) //---------------------------------------------------- @@ -1357,6 +1358,7 @@ UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate) return nTotalSize; } +#endif /* MODPLUG_NO_FILESAVE */ UINT CSoundFile::LoadMixPlugins(const void *pData, UINT nLen) //-----------------------------------------------------------