From bcdca56e325587c72c4a8861892c7bd71c518454 Mon Sep 17 00:00:00 2001 From: Triang3l Date: Sat, 21 Nov 2020 23:52:45 +0300 Subject: [PATCH 1/2] [Build] Mark RTTI as enabled for Android --- premake5.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/premake5.lua b/premake5.lua index a9095c591..50c18145c 100644 --- a/premake5.lua +++ b/premake5.lua @@ -30,6 +30,7 @@ defines({ cppdialect("C++17") exceptionhandling("On") +rtti("On") symbols("On") -- TODO(DrChat): Find a way to disable this on other architectures. From 9f45a1f3385ca400500b3115dcb8055394d89c81 Mon Sep 17 00:00:00 2001 From: Triang3l Date: Sat, 21 Nov 2020 23:54:20 +0300 Subject: [PATCH 2/2] [Base] Use bswap_16/32/64 from byteswap.h on Linux --- src/xenia/base/byte_order.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/xenia/base/byte_order.h b/src/xenia/base/byte_order.h index 6e2d87cea..2a2dee412 100644 --- a/src/xenia/base/byte_order.h +++ b/src/xenia/base/byte_order.h @@ -15,6 +15,10 @@ #include "xenia/base/assert.h" #include "xenia/base/platform.h" +#if XE_PLATFORM_LINUX +#include +#endif + namespace xe { #if XE_PLATFORM_WIN32 @@ -26,9 +30,9 @@ namespace xe { #define XENIA_BASE_BYTE_SWAP_32 OSSwapInt32 #define XENIA_BASE_BYTE_SWAP_64 OSSwapInt64 #else -#define XENIA_BASE_BYTE_SWAP_16 __bswap_16 -#define XENIA_BASE_BYTE_SWAP_32 __bswap_32 -#define XENIA_BASE_BYTE_SWAP_64 __bswap_64 +#define XENIA_BASE_BYTE_SWAP_16 bswap_16 +#define XENIA_BASE_BYTE_SWAP_32 bswap_32 +#define XENIA_BASE_BYTE_SWAP_64 bswap_64 #endif // XE_PLATFORM_WIN32 inline int8_t byte_swap(int8_t value) { return value; }