aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-10-05 07:15:55 +0200
committerdec05eba <dec05eba@protonmail.com>2020-07-06 07:39:33 +0200
commit45e00fd7c7695adb9d69e8621ab76fdfa085900b (patch)
tree167d2a660db7bc4bdc199a438b8255ffc8b45cca /include
parent5250cb90406693163763a214af95f670e0e3a4e0 (diff)
Fix for windows & mingw
Diffstat (limited to 'include')
-rw-r--r--include/Conf.hpp4
-rw-r--r--include/FileUtil.hpp1
-rw-r--r--include/env.hpp2
3 files changed, 3 insertions, 4 deletions
diff --git a/include/Conf.hpp b/include/Conf.hpp
index 15c8471..3cd8cd5 100644
--- a/include/Conf.hpp
+++ b/include/Conf.hpp
@@ -198,13 +198,13 @@ namespace sibs
#if OS_TYPE == OS_TYPE_WINDOWS
#ifdef SIBS_ENV_32BIT
const Platform SYSTEM_PLATFORM = PLATFORM_WIN32;
- #define SYSTEM_PLATFORM_NAME "win32"
+ #define SYSTEM_PLATFORM_NAME L"win32"
#define CONFIG_SYSTEM_PLATFORM CONFIGS_GENERIC_OFFSET + 0
#define CONFIG_STATIC_DEBUG_PLATFORM CONFIGS_GENERIC_OFFSET + 1
#define CONFIG_STATIC_RELEASE_PLATFORM CONFIGS_GENERIC_OFFSET + 2
#else
const Platform SYSTEM_PLATFORM = PLATFORM_WIN64;
- #define SYSTEM_PLATFORM_NAME "win64"
+ #define SYSTEM_PLATFORM_NAME L"win64"
#define CONFIG_SYSTEM_PLATFORM CONFIGS_GENERIC_OFFSET + 3
#define CONFIG_STATIC_DEBUG_PLATFORM CONFIGS_GENERIC_OFFSET + 4
#define CONFIG_STATIC_RELEASE_PLATFORM CONFIGS_GENERIC_OFFSET + 5
diff --git a/include/FileUtil.hpp b/include/FileUtil.hpp
index 0106c19..3e2e302 100644
--- a/include/FileUtil.hpp
+++ b/include/FileUtil.hpp
@@ -60,7 +60,6 @@ namespace sibs
Result<FileString> getRealPath(const _tinydir_char_t *path);
bool pathEquals(const std::string &path, const std::string &otherPath);
Result<u64> getFileLastModifiedTime(const _tinydir_char_t *path);
- Result<bool> copyFile(const FileString &src, const FileString &dst);
}
#endif //SIBS_FILEUTIL_HPP
diff --git a/include/env.hpp b/include/env.hpp
index 33e8068..d8b444b 100644
--- a/include/env.hpp
+++ b/include/env.hpp
@@ -30,7 +30,7 @@
#define WIN32_LEAN_AND_MEAN
#endif
- #include <Windows.h>
+ #include <windows.h>
#endif
#ifdef __linux__