git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/common/env.cpp b/common/env.cpp
index 3b1e1d9d0339523103741574d000e20c877b0838..07f6e55ac230deacd4e0f357e0c4cd3bdb463e02 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -143,9 +143,12 @@ const std::wstring& data_folder()
        return data;\r
 }\r
 \r
+#define QUOTE(str) #str\r
+#define EXPAND_AND_QUOTE(str) QUOTE(str)\r
+\r
 const std::wstring& version()\r
 {\r
-       static std::wstring ver = widen(\r
+       static std::wstring ver = u16(\r
                        EXPAND_AND_QUOTE(CASPAR_GEN)    "." \r
                        EXPAND_AND_QUOTE(CASPAR_MAYOR)  "." \r
                        EXPAND_AND_QUOTE(CASPAR_MINOR)  "." \r

diff --git a/version.tmpl b/version.tmpl
index 64322aecc99a8a2a9a9356d06141a25a98ab49d6..b5ca1ffa1805598fbba70ca68e3bcbbc4b910fdc 100644 (file)
--- a/version.tmpl
+++ b/version.tmpl
@@ -2,4 +2,4 @@
 #define CASPAR_MAYOR 1\r
 #define CASPAR_MINOR 0\r
 #define CASPAR_REV $WCREV$\r
-#define CASPAR_TAG L"UNSTABLE"\r
+#define CASPAR_TAG "UNSTABLE"\r