Skip to content

Commit 5504fe1

Browse files
committed
xrCore: fix define conditions
1 parent 966a40b commit 5504fe1

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/xrCore/Math/MathUtil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "Layers/xrRender/light.h"
1414
#endif
1515
#include "PLC_SSE.hpp"
16-
#if defined(WINDOWS) and defined(XR_X86)
16+
#if defined(WINDOWS) && defined(XR_X86)
1717
#include "SkinXW_SSE.hpp"
1818
#else
1919
#include "SkinXW_CPP.hpp"
@@ -39,7 +39,7 @@ void Initialize()
3939
static bool initialized = false;
4040
if (initialized)
4141
return;
42-
#if defined(WINDOWS) and defined(XR_X86)
42+
#if defined(WINDOWS) && defined(XR_X86)
4343
Skin1W = Skin1W_SSE;
4444
Skin2W = Skin2W_SSE;
4545
Skin3W = Skin3W_SSE;

src/xrCore/Math/SkinXW_SSE.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace XRay
1212
{
1313
namespace Math
1414
{
15-
#if defined(WINDOWS) and defined(XR_X86)
15+
#if defined(WINDOWS) && defined(XR_X86)
1616
#define transform_dir(idx, res, SX, SY, SZ, T1) \
1717
\
1818
__asm movzx eax, \

src/xrCore/Math/SkinXW_SSE.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace XRay
1212
{
1313
namespace Math
1414
{
15-
#if defined(WINDOWS) and defined(XR_X86)
15+
#if defined(WINDOWS) && defined(XR_X86)
1616
void Skin1W_SSE(vertRender* D, vertBoned1W* S, u32 vCount, CBoneInstance* Bones);
1717
void Skin2W_SSE(vertRender* D, vertBoned2W* S, u32 vCount, CBoneInstance* Bones);
1818
void Skin3W_SSE(vertRender* D, vertBoned3W* S, u32 vCount, CBoneInstance* Bones);

0 commit comments

Comments
 (0)