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

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 8167ef669140a4cbedbaa07d502c651a72b169ac..07f6e55ac230deacd4e0f357e0c4cd3bdb463e02 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -25,8 +25,8 @@
 \r
 #include "../version.h"\r
 \r
+#include "except.h"\r
 #include "log.h"\r
-#include "exception/exceptions.h"\r
 #include "string.h"\r
 \r
 #include <boost/property_tree/ptree.hpp>\r
@@ -96,19 +96,19 @@ void configure(const std::wstring& filename)
 \r
        try\r
        {\r
-               auto media_path = boost::filesystem::wpath(media);\r
+               auto media_path = boost::filesystem::path(media);\r
                if(!boost::filesystem::exists(media_path))\r
                        boost::filesystem::create_directory(media_path);\r
                \r
-               auto log_path = boost::filesystem::wpath(log);\r
+               auto log_path = boost::filesystem::path(log);\r
                if(!boost::filesystem::exists(log_path))\r
                        boost::filesystem::create_directory(log_path);\r
                \r
-               auto template_path = boost::filesystem::wpath(ftemplate);\r
+               auto template_path = boost::filesystem::path(ftemplate);\r
                if(!boost::filesystem::exists(template_path))\r
                        boost::filesystem::create_directory(template_path);\r
                \r
-               auto data_path = boost::filesystem::wpath(data);\r
+               auto data_path = boost::filesystem::path(data);\r
                if(!boost::filesystem::exists(data_path))\r
                        boost::filesystem::create_directory(data_path);\r
        }\r
@@ -143,9 +143,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 = u16(\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