# HG changeset patch
# User chainsaw
# Date 1139175171 28800
# Node ID e9cf6c7c662318f2d31e08f8f516d79fa06b3a10
# Parent  d66065066760bf79888d1084ebd3c3bee500a767
[svn] Fix building of the musepack plugin.

diff -r d66065066760 -r e9cf6c7c6623 Plugins/Input/musepack/Makefile.in
--- a/Plugins/Input/musepack/Makefile.in	Sun Feb 05 07:14:48 2006 -0800
+++ b/Plugins/Input/musepack/Makefile.in	Sun Feb 05 13:32:51 2006 -0800
@@ -1,5 +1,5 @@
-include ../../../rules.mk
-include ../../../objective.mk
+include ../../../mk/rules.mk
+include ../../../mk/objective.mk
 
 OBJECTIVE_LIBS = libmpc.so
 
@@ -15,3 +15,4 @@
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) \
 	-I../../../intl -I../../..
+CXXFLAGS = $(CFLAGS)
diff -r d66065066760 -r e9cf6c7c6623 Plugins/Input/musepack/libmpc.cpp
--- a/Plugins/Input/musepack/libmpc.cpp	Sun Feb 05 07:14:48 2006 -0800
+++ b/Plugins/Input/musepack/libmpc.cpp	Sun Feb 05 13:32:51 2006 -0800
@@ -204,7 +204,7 @@
 {
    VFSFile *file;
    gchar magic[3];
-   if (file = vfs_fopen(p_Filename, "rb")) {
+   if ((file = vfs_fopen(p_Filename, "rb"))) {
        vfs_fread(magic, 1, 3, file);
        if (!strncmp(magic, "MP+", 3)) {
             vfs_fclose(file);