From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Tue, 7 Feb 2012 09:16:11 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.1.0_Beta1~899
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0298935819a4e86a0ee06d877fde9fe5f622710a;p=casparcg

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2289 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/common/env.cpp b/common/env.cpp
index 3b1e1d9d0..07f6e55ac 100644
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -143,9 +143,12 @@ const std::wstring& data_folder()
 	return data;
 }
 
+#define QUOTE(str) #str
+#define EXPAND_AND_QUOTE(str) QUOTE(str)
+
 const std::wstring& version()
 {
-	static std::wstring ver = widen(
+	static std::wstring ver = u16(
 			EXPAND_AND_QUOTE(CASPAR_GEN)	"." 
 			EXPAND_AND_QUOTE(CASPAR_MAYOR)  "." 
 			EXPAND_AND_QUOTE(CASPAR_MINOR)  "." 
diff --git a/version.tmpl b/version.tmpl
index 64322aecc..b5ca1ffa1 100644
--- a/version.tmpl
+++ b/version.tmpl
@@ -2,4 +2,4 @@
 #define CASPAR_MAYOR 1
 #define CASPAR_MINOR 0
 #define CASPAR_REV $WCREV$
-#define CASPAR_TAG L"UNSTABLE"
+#define CASPAR_TAG "UNSTABLE"