GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix windows build issues

Browse Source
This commit is contained in:
GeorgH93
2021-02-09 00:24:11 +01:00
parent e871a989b4
commit 9584ec77f1
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp
View File

@@ -13,9 +13,27 @@
namespace openVulkanoCpp namespace openVulkanoCpp
{ {
#ifdef _MSC_VER
using mode_t = unsigned short;
using ssize_t = int64_t;
#endif
namespace LibArchiveHelper namespace LibArchiveHelper
{ {
constexpr mode_t FILE_TYPE_MAP[] = { AE_IFMT, AE_IFREG, AE_IFDIR, AE_IFLNK, AE_IFBLK, AE_IFCHR, AE_IFIFO, AE_IFSOCK, AE_IFMT }; constexpr mode_t GetFileType(std::filesystem::file_type type)
{
switch (type)
{
case std::filesystem::file_type::regular: return AE_IFREG;
case std::filesystem::file_type::directory: return AE_IFDIR;
case std::filesystem::file_type::symlink: return AE_IFLNK;
case std::filesystem::file_type::block: return AE_IFBLK;
case std::filesystem::file_type::character: return AE_IFCHR;
case std::filesystem::file_type::fifo: return AE_IFIFO;
case std::filesystem::file_type::socket: return AE_IFSOCK;
}
return AE_IFMT;
}
constexpr std::filesystem::file_type GetFileType(mode_t type) constexpr std::filesystem::file_type GetFileType(mode_t type)
{ {
@@ -32,11 +50,6 @@ namespace openVulkanoCpp
return std::filesystem::file_type::unknown; return std::filesystem::file_type::unknown;
} }
constexpr mode_t GetFileType(std::filesystem::file_type type)
{
return FILE_TYPE_MAP[static_cast<signed char>(type)];
}
template<bool BLOCK_WRITE = false> template<bool BLOCK_WRITE = false>
inline ssize_t CopyArchiveData(struct archive* archiveReader, struct archive* archiveWriter) inline ssize_t CopyArchiveData(struct archive* archiveReader, struct archive* archiveWriter)
{ {

7
openVulkanoCpp/Math/Frustum.hpp
View File

@@ -8,6 +8,13 @@
#include "Math.hpp" #include "Math.hpp"
#ifdef NEAR
#undef NEAR
#endif
#ifdef FAR
#undef FAR
#endif
namespace openVulkanoCpp::Math namespace openVulkanoCpp::Math
{ {
class Frustum class Frustum