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

Fixing win32 build. Silly VC.

This commit is contained in:
Ben Vanik 2014-08-22 18:44:52 -07:00
parent eebe68b77a
commit ba5b626cdf
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/alloy/backend/x64/x64_sequence.inl
View File

@ -528,7 +528,12 @@ template <typename SEQ, typename T>
struct SingleSequence : public Sequence<SingleSequence<SEQ, T>, T> { struct SingleSequence : public Sequence<SingleSequence<SEQ, T>, T> {
typedef Sequence<SingleSequence<SEQ, T>, T> BASE; typedef Sequence<SingleSequence<SEQ, T>, T> BASE;
typedef T EmitArgType; typedef T EmitArgType;
// TODO(benvanik): find a way to do this cross-compiler.
#if XE_COMPILER_MSVC
static uint32_t head_key() { return T::key; }
#else
static constexpr uint32_t head_key() { return T::key; } static constexpr uint32_t head_key() { return T::key; }
#endif // XE_COMPILER_MSVC
static void Emit(X64Emitter& e, const typename BASE::EmitArgs& _) { static void Emit(X64Emitter& e, const typename BASE::EmitArgs& _) {
SEQ::Emit(e, _.i1); SEQ::Emit(e, _.i1);
} }

6
src/poly/platform.h
View File

@ -144,13 +144,13 @@ XE_CPU: 32BIT | 64BIT | BIGENDIAN | LITTLEENDIAN
#if XE_COMPILER_MSVC #if XE_COMPILER_MSVC
// Disable warning C4068: unknown pragma // Disable warning C4068: unknown pragma
#pragma warning(disable : 4068) #pragma warning(disable : 4068)
#endif // MSVC #endif // XE_COMPILER_MSVC
#if XE_COMPILER_MSVC #if XE_COMPILER_MSVC
#include <intrin.h> #include <intrin.h>
#else #else
#include <x86intrin.h> #include <x86intrin.h>
#endif // MSVC #endif // XE_COMPILER_MSVC
namespace poly { namespace poly {
@ -160,7 +160,7 @@ const size_t max_path = _MAX_PATH;
#else #else
const char path_separator = '/'; const char path_separator = '/';
const size_t max_path = 1024; // PATH_MAX const size_t max_path = 1024; // PATH_MAX
#endif // WIN32 #endif // XE_LIKE_WIN32
} // namespace poly } // namespace poly