git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@2287...

diff --git a/common/env.cpp b/common/env.cpp
index 21738e85486d65720b3986426daec5770d8bf307..91d0969d3334abe69ec0360e9df39b83267d970a 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -145,9 +145,17 @@ 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 = std::wstring(L"") + CASPAR_GEN + L"." + CASPAR_MAYOR + L"." + CASPAR_MINOR + L"." + CASPAR_REV + L" " + CASPAR_TAG;\r
+       static std::wstring ver = widen(\r
+                       EXPAND_AND_QUOTE(CASPAR_GEN)    "." \r
+                       EXPAND_AND_QUOTE(CASPAR_MAYOR)  "." \r
+                       EXPAND_AND_QUOTE(CASPAR_MINOR)  "." \r
+                       EXPAND_AND_QUOTE(CASPAR_REV)    " " \r
+                       CASPAR_TAG);\r
        return ver;\r
 }\r
 \r