From 0d0fa21e695f3082576053bf0c9b71a3bcc154a4 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Tue, 22 May 2018 17:39:36 +0200
Subject: Fix for windows

---
 include/Conf.hpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'include')

diff --git a/include/Conf.hpp b/include/Conf.hpp
index 9a9cacf..6018b48 100644
--- a/include/Conf.hpp
+++ b/include/Conf.hpp
@@ -174,8 +174,8 @@ namespace sibs
             #define CONFIG_STATIC_DEBUG_PLATFORM 4
             #define CONFIG_STATIC_RELEASE_PLATFORM 5
         #endif
-            #define CONFIG_STATIC_LIB_FILE_EXTENSION "lib"
-            #define CONFIG_DYNAMIC_LIB_FILE_EXTENSION "dll"
+            #define CONFIG_STATIC_LIB_FILE_EXTENSION L"lib"
+            #define CONFIG_DYNAMIC_LIB_FILE_EXTENSION L"dll"
     #elif OS_TYPE == OS_TYPE_LINUX
         #ifdef SIBS_ENV_32BIT
             #define SYSTEM_PLATFORM Platform::PLATFORM_LINUX32
@@ -221,10 +221,10 @@ namespace sibs
             switch(optimizationLevel)
             {
                 case OPT_LEV_DEBUG:
-                    cmakeArgsGlobal = "-G Ninja \"-DCMAKE_BUILD_TYPE=Debug\"";
+                    cmakeArgsGlobal = TINYDIR_STRING("-G Ninja \"-DCMAKE_BUILD_TYPE=Debug\"");
                     break;
                 case OPT_LEV_RELEASE:
-                    cmakeArgsGlobal = "-G Ninja \"-DCMAKE_BUILD_TYPE=Release\"";
+                    cmakeArgsGlobal = TINYDIR_STRING("-G Ninja \"-DCMAKE_BUILD_TYPE=Release\"");
                     break;
             }
         }
@@ -326,29 +326,29 @@ namespace sibs
         }
         
         // Get cmake args for all builds. This is args under [cmake] only
-        const std::string& getCmakeArgs() const
+        const FileString& getCmakeArgs() const
         {
             return cmakeArgsGlobal;
         }
         
         // Get cmake args for static build. This is a combination of args under [cmake] and under [cmake.static]
-        std::string getCmakeArgsStatic() const
+        FileString getCmakeArgsStatic() const
         {
-            std::string result;
+			FileString result;
             result.reserve(cmakeArgsGlobal.size() + 1 + cmakeArgsStatic.size());
             result += cmakeArgsGlobal;
-            result += " ";
+            result += TINYDIR_STRING(" ");
             result += cmakeArgsStatic;
             return result;
         }
         
         // Get cmake args for dynamic build. This is a combination of args under [cmake] and under [cmake.dynamic]
-        std::string getCmakeArgsDynamic() const
+        FileString getCmakeArgsDynamic() const
         {
-            std::string result;
+			FileString result;
             result.reserve(cmakeArgsGlobal.size() + 1 + cmakeArgsDynamic.size());
             result += cmakeArgsGlobal;
-            result += " ";
+            result += TINYDIR_STRING(" ");
             result += cmakeArgsDynamic;
             return result;
         }
@@ -409,7 +409,7 @@ namespace sibs
         void parsePlatformConfig(const StringView &fieldName, const ConfigValue &fieldValue);
         void parsePlatformConfigStaticDebug(const StringView &fieldName, const ConfigValue &fieldValue);
         void parsePlatformConfigStaticRelease(const StringView &fieldName, const ConfigValue &fieldValue);
-        void parseCmake(const StringView &fieldName, const ConfigValue &fieldValue, std::string &cmakeDir, std::string &cmakeArgs);
+        void parseCmake(const StringView &fieldName, const ConfigValue &fieldValue, FileString &cmakeDir, FileString &cmakeArgs);
         void validatePackageName() const;
     protected:
         StringView currentObject;
@@ -431,9 +431,9 @@ namespace sibs
         FileString cmakeDirGlobal;
         FileString cmakeDirStatic;
         FileString cmakeDirDynamic;
-        std::string cmakeArgsGlobal;
-        std::string cmakeArgsStatic;
-        std::string cmakeArgsDynamic;
+        FileString cmakeArgsGlobal;
+		FileString cmakeArgsStatic;
+		FileString cmakeArgsDynamic;
         CVersion cVersion;
         CPPVersion cppVersion;
         bool useCmake;
-- 
cgit v1.2.3