From 7cf1a1aab8bc041f8fb1c95a0aa8beb8d06db84e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 2 Feb 2015 14:58:51 -0500
Subject: [PATCH] fixup cmake merge

---
 src/Makefile       | 2 --
 src/config.h.in    | 1 -
 src/sdl/i_system.c | 8 ++++++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index a1a8804e..d4cc64a4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -585,8 +585,6 @@ $(BIN)/$(EXENAME): $(POS) $(OBJS)
 	-$(MKDIR) $(BIN)
 	@echo Linking $(EXENAME)...
 	$(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS)
-	@echo $(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS)
-	@echo $(CFLAGS)
 ifndef VALGRIND
 ifndef NOOBJDUMP
 	@echo Dumping debugging info
diff --git a/src/config.h.in b/src/config.h.in
index 6e7c64da..7c5b299c 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -22,6 +22,5 @@
 #define ASSET_HASH_PLAYER_DTA "cfca0f1c73023cbbd8f844f45480f799"
 #define ASSET_HASH_RINGS_DTA  "85901ad4bf94637e5753d2ac2c03ea26"
 
-#define 
 #endif
 #endif
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 567611ec..054196a2 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -20,7 +20,11 @@
 /// \file
 /// \brief SRB2 system stuff for SDL
 
+#ifdef CMAKECONFIG
 #include "config.h"
+#else
+#include "config.h.in"
+#endif
 
 #ifndef _WIN32_WCE
 #include <signal.h>
@@ -1658,7 +1662,11 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 		return;
 
 	if(mumble->uiVersion != 2) {
+#ifdef VERSIONSTRINGW
 		wcsncpy(mumble->name, L"SRB2 "VERSIONSTRINGW, 256);
+#else
+		wcsncpy(mumble->name, L"SRB2 "VERSIONSTRING, 256);
+#endif
 		wcsncpy(mumble->description, L"Sonic Robo Blast 2 with integrated Mumble Link support.", 2048);
 		mumble->uiVersion = 2;
 	}