mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-22 18:39:46 +00:00
fix Android build
This commit is contained in:
parent
2053b3a11f
commit
ee41e058a9
2 changed files with 12 additions and 3 deletions
|
|
@ -1,15 +1,14 @@
|
||||||
#include "commons.hpp"
|
#include "commons.hpp"
|
||||||
|
|
||||||
#pragma comment(lib, "Ws2_32.lib")
|
|
||||||
|
|
||||||
#define NOMINMAX
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
#define NOMINMAX
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
|
#pragma comment(lib, "Ws2_32.lib")
|
||||||
#define SHUT_RDWR SD_BOTH
|
#define SHUT_RDWR SD_BOTH
|
||||||
#else
|
#else
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,14 @@
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
#elif defined(__ANDROID__)
|
||||||
|
static inline void* aligned_alloc(size_t alignment, size_t size) {
|
||||||
|
void* ptr = nullptr;
|
||||||
|
if (posix_memalign(&ptr, alignment, size) != 0) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace util {
|
namespace util {
|
||||||
|
|
@ -63,6 +71,8 @@ namespace util {
|
||||||
std::unique_ptr<void, AlignedDeleter> ptr(
|
std::unique_ptr<void, AlignedDeleter> ptr(
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
_aligned_malloc(sizeof(T), alignof(T))
|
_aligned_malloc(sizeof(T), alignof(T))
|
||||||
|
#elif defined(__ANDROID__)
|
||||||
|
aligned_alloc(sizeof(T), alignof(T))
|
||||||
#else
|
#else
|
||||||
std::aligned_alloc(alignof(T), sizeof(T))
|
std::aligned_alloc(alignof(T), sizeof(T))
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue