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

Merge branch 'master' into vulkan

This commit is contained in:
Triang3l 2020-11-21 23:55:27 +03:00
parent 03d0988ea4 9f45a1f338
commit 90dcc28281
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
premake5.lua
View File

@ -30,6 +30,7 @@ defines({
cppdialect("C++17") cppdialect("C++17")
exceptionhandling("On") exceptionhandling("On")
rtti("On")
symbols("On") symbols("On")
-- TODO(DrChat): Find a way to disable this on other architectures. -- TODO(DrChat): Find a way to disable this on other architectures.

10
src/xenia/base/byte_order.h
View File

@ -15,6 +15,10 @@
#include "xenia/base/assert.h" #include "xenia/base/assert.h"
#include "xenia/base/platform.h" #include "xenia/base/platform.h"
#if XE_PLATFORM_LINUX
#include <byteswap.h>
#endif
namespace xe { namespace xe {
#if XE_PLATFORM_WIN32 #if XE_PLATFORM_WIN32
@ -26,9 +30,9 @@ namespace xe {
#define XENIA_BASE_BYTE_SWAP_32 OSSwapInt32 #define XENIA_BASE_BYTE_SWAP_32 OSSwapInt32
#define XENIA_BASE_BYTE_SWAP_64 OSSwapInt64 #define XENIA_BASE_BYTE_SWAP_64 OSSwapInt64
#else #else
#define XENIA_BASE_BYTE_SWAP_16 __bswap_16 #define XENIA_BASE_BYTE_SWAP_16 bswap_16
#define XENIA_BASE_BYTE_SWAP_32 __bswap_32 #define XENIA_BASE_BYTE_SWAP_32 bswap_32
#define XENIA_BASE_BYTE_SWAP_64 __bswap_64 #define XENIA_BASE_BYTE_SWAP_64 bswap_64
#endif // XE_PLATFORM_WIN32 #endif // XE_PLATFORM_WIN32
inline int8_t byte_swap(int8_t value) { return value; } inline int8_t byte_swap(int8_t value) { return value; }