ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Base] Android and Arm platform defines

This commit is contained in:
Triang3l 2020-11-21 16:26:26 +03:00
parent 14157e063a
commit 48c97dd3b4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/app/xenia_main.cc
View File

@ -216,7 +216,7 @@ int xenia_main(const std::vector<std::string>& args) {
if (!cvars::portable && if (!cvars::portable &&
!std::filesystem::exists(storage_root / "portable.txt")) { !std::filesystem::exists(storage_root / "portable.txt")) {
storage_root = xe::filesystem::GetUserFolder(); storage_root = xe::filesystem::GetUserFolder();
#if defined(XE_PLATFORM_WIN32) || defined(XE_PLATFORM_LINUX) #if defined(XE_PLATFORM_WIN32) || defined(XE_PLATFORM_GNU_LINUX)
storage_root = storage_root / "Xenia"; storage_root = storage_root / "Xenia";
#else #else
#warning Unhandled platform for the data root. #warning Unhandled platform for the data root.

15
src/xenia/base/platform.h
View File

@ -31,8 +31,14 @@
#define XE_PLATFORM_MAC 1 #define XE_PLATFORM_MAC 1
#elif defined(WIN32) || defined(_WIN32) #elif defined(WIN32) || defined(_WIN32)
#define XE_PLATFORM_WIN32 1 #define XE_PLATFORM_WIN32 1
#else #elif defined(__ANDROID__)
#define XE_PLATFORM_ANDROID 1
#define XE_PLATFORM_LINUX 1 #define XE_PLATFORM_LINUX 1
#elif defined(__gnu_linux__)
#define XE_PLATFORM_GNU_LINUX 1
#define XE_PLATFORM_LINUX 1
#else
#error Unsupported target OS.
#endif #endif
#if defined(__clang__) #if defined(__clang__)
@ -51,8 +57,11 @@
#if defined(_M_AMD64) || defined(__amd64__) #if defined(_M_AMD64) || defined(__amd64__)
#define XE_ARCH_AMD64 1 #define XE_ARCH_AMD64 1
#elif defined(_M_IX86) #elif defined(_M_ARM64) || defined(__aarch64__)
#error "Xenia is not supported on 32-bit platforms." #define XE_ARCH_ARM64 1
#elif defined(_M_IX86) || defined(__i386__) || defined(_M_ARM) || \
defined(__arm__)
#error Xenia is not supported on 32-bit platforms.
#elif defined(_M_PPC) || defined(__powerpc__) #elif defined(_M_PPC) || defined(__powerpc__)
#define XE_ARCH_PPC 1 #define XE_ARCH_PPC 1
#endif #endif