From a2ebf771d30ed75413e746128a6057ea249ddae9 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@users.noreply.github.com>
Date: Mon, 28 Dec 2015 19:13:34 -0600
Subject: [PATCH] Remove '\r' character from beginning of WildMidi error
 messages

---
 src/wildmidi/wm_error.cpp |  8 ++---
 zdoom.vcproj              | 68 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/src/wildmidi/wm_error.cpp b/src/wildmidi/wm_error.cpp
index 9fabdff84..eab56c437 100644
--- a/src/wildmidi/wm_error.cpp
+++ b/src/wildmidi/wm_error.cpp
@@ -67,18 +67,18 @@ void _WM_ERROR(const char * func, unsigned int lne, int wmerno,
 
 	if (wmfor != NULL) {
 		if (error != 0) {
-			Printf(TEXTCOLOR_RED "\rlibWildMidi(%s:%u): ERROR %s %s (%s)\n", func,
+			Printf(TEXTCOLOR_RED "libWildMidi(%s:%u): ERROR %s %s (%s)\n", func,
 					lne, errors[wmerno], wmfor, strerror(error));
 		} else {
-			Printf(TEXTCOLOR_RED "\rlibWildMidi(%s:%u): ERROR %s %s\n", func, lne,
+			Printf(TEXTCOLOR_RED "libWildMidi(%s:%u): ERROR %s %s\n", func, lne,
 					errors[wmerno], wmfor);
 		}
 	} else {
 		if (error != 0) {
-			Printf(TEXTCOLOR_RED "\rlibWildMidi(%s:%u): ERROR %s (%s)\n", func, lne,
+			Printf(TEXTCOLOR_RED "libWildMidi(%s:%u): ERROR %s (%s)\n", func, lne,
 					errors[wmerno], strerror(error));
 		} else {
-			Printf(TEXTCOLOR_RED "\rlibWildMidi(%s:%u): ERROR %s\n", func, lne,
+			Printf(TEXTCOLOR_RED "libWildMidi(%s:%u): ERROR %s\n", func, lne,
 					errors[wmerno]);
 		}
 	}
diff --git a/zdoom.vcproj b/zdoom.vcproj
index db4660d3b..126efb7f5 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -2553,6 +2553,10 @@
 				RelativePath="src\sound\music_midi_timidity.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\sound\music_midi_wildmidi.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\sound\music_midistream.cpp"
 				>
@@ -2789,6 +2793,70 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="WildMidi"
+				>
+				<Filter
+					Name="Headers"
+					>
+					<File
+						RelativePath=".\src\wildmidi\common.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\file_io.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\gus_pat.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\lock.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\reverb.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\wildmidi_lib.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\wm_error.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source"
+					>
+					<File
+						RelativePath=".\src\wildmidi\file_io.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\gus_pat.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\lock.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\reverb.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\wildmidi_lib.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\wildmidi\wm_error.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="SDL Files"