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

diff --git a/common/env.cpp b/common/env.cpp
index bd981df178f88ccd2b9922e95f8f7c3449eb5bea..3b1e1d9d0339523103741574d000e20c877b0838 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -145,7 +145,12 @@ const std::wstring& data_folder()
 \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

diff --git a/shell/shell.rc b/shell/shell.rc
index eaadb19a01713c4581c5b57938a869a10502aa86..7b54f2d88690a560fc6061881cae4794b9b78125 100644 (file)
Binary files a/shell/shell.rc and b/shell/shell.rc differ

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