diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Conf.hpp | 8 | ||||
| -rw-r--r-- | include/FileUtil.hpp | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/Conf.hpp b/include/Conf.hpp index f1dded6..dd8b003 100644 --- a/include/Conf.hpp +++ b/include/Conf.hpp @@ -175,13 +175,13 @@ namespace sibs #if OS_TYPE == OS_TYPE_WINDOWS #ifdef SIBS_ENV_32BIT - #define SYSTEM_PLATFORM Platform::PLATFORM_WIN32 + const Platform SYSTEM_PLATFORM = PLATFORM_WIN32; #define SYSTEM_PLATFORM_NAME "win32" #define CONFIG_SYSTEM_PLATFORM 0 #define CONFIG_STATIC_DEBUG_PLATFORM 1 #define CONFIG_STATIC_RELEASE_PLATFORM 2 #else - #define SYSTEM_PLATFORM Platform::PLATFORM_WIN64 + const Platform SYSTEM_PLATFORM = PLATFORM_WIN64; #define SYSTEM_PLATFORM_NAME "win64" #define CONFIG_SYSTEM_PLATFORM 3 #define CONFIG_STATIC_DEBUG_PLATFORM 4 @@ -191,13 +191,13 @@ namespace sibs #define CONFIG_DYNAMIC_LIB_FILE_EXTENSION L"dll" #elif OS_TYPE == OS_TYPE_LINUX #ifdef SIBS_ENV_32BIT - #define SYSTEM_PLATFORM Platform::PLATFORM_LINUX32 + const Platform SYSTEM_PLATFORM = PLATFORM_LINUX32; #define SYSTEM_PLATFORM_NAME "linux32" #define CONFIG_SYSTEM_PLATFORM 6 #define CONFIG_STATIC_DEBUG_PLATFORM 7 #define CONFIG_STATIC_RELEASE_PLATFORM 8 #else - #define SYSTEM_PLATFORM Platform::PLATFORM_LINUX64 + const Platform SYSTEM_PLATFORM = PLATFORM_LINUX64; #define SYSTEM_PLATFORM_NAME "linux64" #define CONFIG_SYSTEM_PLATFORM 9 #define CONFIG_STATIC_DEBUG_PLATFORM 10 diff --git a/include/FileUtil.hpp b/include/FileUtil.hpp index aa2b82f..3e2e302 100644 --- a/include/FileUtil.hpp +++ b/include/FileUtil.hpp @@ -21,7 +21,8 @@ namespace sibs using FileString = std::basic_string<_tinydir_char_t, std::char_traits<_tinydir_char_t>, std::allocator<_tinydir_char_t>>; #if OS_FAMILY == OS_FAMILY_POSIX - #define toUtf8(input) input + std::string toUtf8(const std::string &input); + std::string toUtf8(const char *input); FileString toFileString(const std::string &utf8Str); FileString toFileString(const StringView &utf8Str); #else |